Changeset 102171 in webkit

Timestamp:

Dec 6, 2011 1:06:22 PM (12 years ago)

Author:

adamk@chromium.org

Message:

[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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebKit.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+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  Alexandre Elias  <aelias@google.com>
 

trunk/Source/WebKit/chromium/src/WebKit.cpp

@@ -94 +94 @@
 
 #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
 }
@@ -128 +131 @@
 #if ENABLE(MUTATION_OBSERVERS)
     if (s_endOfTaskRunner) {
+        ASSERT(s_webKitPlatformSupport->currentThread());
         s_webKitPlatformSupport->currentThread()->removeTaskObserver(s_endOfTaskRunner);
         delete s_endOfTaskRunner;