Attachment 146340 Details for Bug 88562 – Patch

[patch] Patch

bug-88562-20120607143600.patch (text/plain), 6.11 KB, created by Mark Pilgrim (Google) on 2012-06-07 11:36:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-06-07 11:36:50 PDT

Size: 6.11 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 119741)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2012-06-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move didStartWorkerRunLoop to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=88562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * WebCore.gyp/WebCore.gyp:
>+        * bindings/v8/WorkerScriptController.cpp:
>+        (WebCore::WorkerScriptController::~WorkerScriptController):
>+        * platform/chromium/PlatformSupport.h:
>+        (WebCore):
>+        * workers/WorkerThread.cpp:
>+        (WebCore::WorkerThread::workerThread):
>+
> 2012-06-07  Mark Hahnenberg  <mhahnenberg@apple.com>
> 
>         Worker tear-down can re-enter JSC during GC finalization
>Index: Source/WebCore/WebCore.gyp/WebCore.gyp
>===================================================================
>--- Source/WebCore/WebCore.gyp/WebCore.gyp	(revision 119739)
>+++ Source/WebCore/WebCore.gyp/WebCore.gyp	(working copy)
>@@ -1841,6 +1841,9 @@
>     {
>       'target_name': 'webcore_remaining',
>       'type': 'static_library',
>+      'defines': [
>+        'WEBKIT_IMPLEMENTATION=1',
>+      ],
>       'dependencies': [
>         'webcore_prerequisites',
>         '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
>Index: Source/WebCore/bindings/v8/WorkerScriptController.cpp
>===================================================================
>--- Source/WebCore/bindings/v8/WorkerScriptController.cpp	(revision 119739)
>+++ Source/WebCore/bindings/v8/WorkerScriptController.cpp	(working copy)
>@@ -47,6 +47,11 @@
> #include "WorkerThread.h"
> #include <v8.h>
> 
>+#if PLATFORM(CHROMIUM)
>+#include <public/Platform.h>
>+#include <public/WebWorkerRunLoop.h>
>+#endif
>+
> namespace WebCore {
> 
> WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
>@@ -69,7 +74,7 @@ WorkerScriptController::~WorkerScriptCon
>     // The corresponding call to didStartWorkerRunLoop is in
>     // WorkerThread::workerThread().
>     // See http://webkit.org/b/83104#c14 for why this is here.
>-    PlatformSupport::didStopWorkerRunLoop(&m_workerContext->thread()->runLoop());
>+    WebKit::Platform::current()->didStopWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_workerContext->thread()->runLoop()));
> #endif
>     m_proxy.clear();
>     m_isolate->Exit();
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 119739)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -81,7 +81,6 @@ class IntRect;
> class KURL;
> class SerializedScriptValue;
> class Widget;
>-class WorkerRunLoop;
> 
> struct Cookie;
> struct FontRenderStyle;
>@@ -331,9 +330,6 @@ public:
>     // Visited links ------------------------------------------------------
>     static LinkHash visitedLinkHash(const UChar* url, unsigned length);
>     static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
>-
>-    static void didStartWorkerRunLoop(WorkerRunLoop*);
>-    static void didStopWorkerRunLoop(WorkerRunLoop*);
> };
> 
> } // namespace WebCore
>Index: Source/WebCore/workers/WorkerThread.cpp
>===================================================================
>--- Source/WebCore/workers/WorkerThread.cpp	(revision 119739)
>+++ Source/WebCore/workers/WorkerThread.cpp	(working copy)
>@@ -20,7 +20,7 @@
>  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  *
>  */
> 
>@@ -47,6 +47,11 @@
> #include "DatabaseTracker.h"
> #endif
> 
>+#if PLATFORM(CHROMIUM)
>+#include <public/Platform.h>
>+#include <public/WebWorkerRunLoop.h>
>+#endif
>+
> namespace WebCore {
> 
> static Mutex& threadCountMutex()
>@@ -144,7 +149,7 @@ void WorkerThread::workerThread()
> #if PLATFORM(CHROMIUM)
>     // The corresponding call to didStopWorkerRunLoop is in
>     // ~WorkerScriptController.
>-    PlatformSupport::didStartWorkerRunLoop(&m_runLoop);
>+    WebKit::Platform::current()->didStartWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_runLoop));
> #endif
> 
>     WorkerScriptController* script = m_workerContext->script();
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 119741)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-06-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move didStartWorkerRunLoop to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=88562
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-06-07  Daniel Erat  <derat@chromium.org>
> 
>         Add setting to enable subpixel-positioned text on Linux.
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 119739)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -96,7 +96,6 @@
> #include <public/WebCookie.h>
> #include <public/WebCookieJar.h>
> #include <public/WebMimeRegistry.h>
>-#include <public/WebWorkerRunLoop.h>
> #include <wtf/Assertions.h>
> 
> // We are part of the WebKit implementation.
>@@ -721,16 +720,6 @@ bool PlatformSupport::popupsAllowed(NPP
> }
> 
> #if ENABLE(WORKERS)
>-void PlatformSupport::didStartWorkerRunLoop(WorkerRunLoop* loop)
>-{
>-    WebKit::Platform::current()->didStartWorkerRunLoop(WebWorkerRunLoop(loop));
>-}
>-
>-void PlatformSupport::didStopWorkerRunLoop(WorkerRunLoop* loop)
>-{
>-    WebKit::Platform::current()->didStopWorkerRunLoop(WebWorkerRunLoop(loop));
>-}
>-
> WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
> {
>     return WebWorkerClientImpl::createWorkerContextProxy(worker);

Actions: View | Formatted Diff | Diff

Attachments on bug 88562: 146340