Attachment 118081 Details for Bug 73937 – Patch for landing

[patch] Patch for landing

bug-73937-20111206114416.patch (text/plain), 2.18 KB, created by Adam Klein on 2011-12-06 11:44:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Klein

Created: 2011-12-06 11:44:17 PST

Size: 2.18 KB

patch

obsolete

>Subversion Revision: 102152
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index cc4b0aac46d29b21722032c419326dee2cbf6d74..282d6a65d4fea7ad97e1ab31f0c0850c2c91acb9 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-12-06  Adam Klein  <adamk@chromium.org>
>+
>+        [chromium] Guard access to WebKitPlatformSupport::currentThread with a null check
>+        https://bugs.webkit.org/show_bug.cgi?id=73937
>+
>+        Reviewed by Adam Barth.
>+
>+        Though |currentThread| is never null in production code, it is null in
>+        unit tests (such as Chromium's unit_tests) that call WebKit::initialize()
>+        without first constructing a MessageLoop.
>+
>+        * src/WebKit.cpp:
>+        (WebKit::initialize):
>+        (WebKit::shutdown):
>+
> 2011-12-06  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r102102.
>diff --git a/Source/WebKit/chromium/src/WebKit.cpp b/Source/WebKit/chromium/src/WebKit.cpp
>index 76e729dc3f7f7e4a590c164c7019be29d26b4f4a..2b2b2597cfcbe3569d65aa692507a0133ea782e6 100644
>--- a/Source/WebKit/chromium/src/WebKit.cpp
>+++ b/Source/WebKit/chromium/src/WebKit.cpp
>@@ -93,9 +93,12 @@ void initialize(WebKitPlatformSupport* webKitPlatformSupport)
>     WebCore::V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
> 
> #if ENABLE(MUTATION_OBSERVERS)
>-    ASSERT(!s_endOfTaskRunner);
>-    s_endOfTaskRunner = new EndOfTaskRunner;
>-    webKitPlatformSupport->currentThread()->addTaskObserver(s_endOfTaskRunner);
>+    // currentThread will always be non-null in production, but can be null in Chromium unit tests.
>+    if (WebThread* currentThread = webKitPlatformSupport->currentThread()) {
>+        ASSERT(!s_endOfTaskRunner);
>+        s_endOfTaskRunner = new EndOfTaskRunner;
>+        currentThread->addTaskObserver(s_endOfTaskRunner);
>+    }
> #endif
> }
> 
>@@ -127,6 +130,7 @@ void shutdown()
> {
> #if ENABLE(MUTATION_OBSERVERS)
>     if (s_endOfTaskRunner) {
>+        ASSERT(s_webKitPlatformSupport->currentThread());
>         s_webKitPlatformSupport->currentThread()->removeTaskObserver(s_endOfTaskRunner);
>         delete s_endOfTaskRunner;
>         s_endOfTaskRunner = 0;

Actions: View | Formatted Diff | Diff

Attachments on bug 73937: 118076 | 118081