summaryrefslogtreecommitdiffstats
path: root/android_webview/native
diff options
context:
space:
mode:
authorboliu <boliu@chromium.org>2015-10-20 10:10:03 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-20 17:11:12 +0000
commit55a4658c3566a13b19fffb9d48a05e5a31a40beb (patch)
tree2bd155c11d4ac28b6b92e8dfa0b21b2e9e73437b /android_webview/native
parent19b0246d55a5766e4e08294a3022fc757ca955eb (diff)
downloadchromium_src-55a4658c3566a13b19fffb9d48a05e5a31a40beb.zip
chromium_src-55a4658c3566a13b19fffb9d48a05e5a31a40beb.tar.gz
chromium_src-55a4658c3566a13b19fffb9d48a05e5a31a40beb.tar.bz2
aw: Disable hardware for gc tests
The fake functor implementation using GLSurfaceView is causing detach to deadlock on the UI thread. So just disable hardware for these tests. Also remove debug logging. BUG=544098 Review URL: https://codereview.chromium.org/1413393002 Cr-Commit-Position: refs/heads/master@{#355085}
Diffstat (limited to 'android_webview/native')
-rw-r--r--android_webview/native/aw_contents.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 9dfc343..8065d2c 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -192,10 +192,7 @@ AwContents::AwContents(scoped_ptr<WebContents> web_contents)
switches::kDisablePageVisibility)),
web_contents_(web_contents.Pass()),
renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) {
- base::subtle::Atomic32 instance_count =
- base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
- VLOG(2) << "AwContents::~AwContents " << this << " instance_count "
- << instance_count;
+ base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
icon_helper_.reset(new IconHelper(web_contents_.get()));
icon_helper_->SetListener(this);
web_contents_->SetUserData(android_webview::kAwContentsUserDataKey,
@@ -304,8 +301,6 @@ AwContents::~AwContents() {
base::MemoryPressureListener::NotifyMemoryPressure(
base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
}
- VLOG(2) << "AwContents::~AwContents " << this << " instance_count "
- << instance_count;
}
base::android::ScopedJavaLocalRef<jobject>