diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 19:41:19 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 19:41:19 +0000 |
| commit | 3c6de13983e12c3506fd53502fc92075b2595136 (patch) | |
| tree | aa9581d47a7f6b52a0a0a385244fac55c52207b2 /content/browser | |
| parent | fb5d19ca93b1008e93f5b875cfd7fd96971a290c (diff) | |
| download | chromium_src-3c6de13983e12c3506fd53502fc92075b2595136.zip chromium_src-3c6de13983e12c3506fd53502fc92075b2595136.tar.gz chromium_src-3c6de13983e12c3506fd53502fc92075b2595136.tar.bz2 | |
Revert "move webkit/glue/webthread_impl* to webkit/child/"
Crashes in webkit_unit_tests, SameOriginRestriction on Linux:
Program received signal SIGSEGV, Segmentation fault.
0x00000000004dcc5f in (anonymous namespace)::AssociatedURLLoaderTest::CheckFails (this=0x30c5b691b520, request=..., options=...)
at ../../third_party/WebKit/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp:223
223 Platform::current()->currentThread()->enterRunLoop();
(gdb) p Platform::current()
$1 = (WebKit::Platform *) 0x30c5b6023028
(gdb) p Platform::current()->currentThread()
$2 = (WebKit::WebThread *) 0x0
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/17092006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/DEPS | 1 | ||||
| -rw-r--r-- | content/browser/renderer_host/compositor_impl_android.cc | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/content/browser/DEPS b/content/browser/DEPS index 87d470c..4bc3f3c 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS @@ -25,7 +25,6 @@ include_rules = [ "+chromeos", "+third_party/cros_system_api", - "-webkit/child", "-webkit/renderer", # DO NOT ADD ANY CHROME OR COMPONENTS INCLUDES HERE!!! diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index c5560e6..b475308 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -15,7 +15,6 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/synchronization/lock.h" -#include "base/threading/thread.h" #include "cc/base/thread_impl.h" #include "cc/input/input_handler.h" #include "cc/layers/layer.h" @@ -35,6 +34,7 @@ #include "third_party/khronos/GLES2/gl2ext.h" #include "ui/gfx/android/java_bitmap.h" #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/glue/webthread_impl.h" namespace gfx { class JavaBitmap; @@ -57,7 +57,7 @@ class DirectOutputSurface : public cc::OutputSurface { }; static bool g_initialized = false; -static base::Thread* g_impl_thread = NULL; +static webkit_glue::WebThreadImpl* g_impl_thread = NULL; static bool g_use_direct_gl = false; } // anonymous namespace @@ -87,8 +87,7 @@ void Compositor::InitializeWithFlags(uint32 flags) { if (flags & ENABLE_COMPOSITOR_THREAD) { TRACE_EVENT_INSTANT0("test_gpu", "ThreadedCompositingInitialization", TRACE_EVENT_SCOPE_THREAD); - g_impl_thread = new base::Thread("Browser Compositor"); - g_impl_thread->Start(); + g_impl_thread = new webkit_glue::WebThreadImpl("Browser Compositor"); } Compositor::Initialize(); } |