Title: [136741] trunk/Source/WebKit/chromium
Revision
136741
Author
pilg...@chromium.org
Date
2012-12-05 12:49:21 -0800 (Wed, 05 Dec 2012)

Log Message

[Chromium] Move WorkerContextProxy::create out of PlatformSupport
https://bugs.webkit.org/show_bug.cgi?id=104151

Reviewed by Adam Barth.

Doesn't really solve the layering violation as much as kick it
down the road a bit. Part of a refactoring series; see tracking
bug 82948.

* WebKit.gyp:
* src/PlatformSupport.cpp:
(WebCore):
* src/WorkerContextProxy.cpp: Added.
(WebCore):
(WebCore::WebCore::WorkerContextProxy::create):

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (136740 => 136741)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-12-05 20:47:34 UTC (rev 136740)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-12-05 20:49:21 UTC (rev 136741)
@@ -1,5 +1,23 @@
 2012-12-05  Mark Pilgrim  <pilg...@chromium.org>
 
+        [Chromium] Move WorkerContextProxy::create out of PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=104151
+
+        Reviewed by Adam Barth.
+
+        Doesn't really solve the layering violation as much as kick it
+        down the road a bit. Part of a refactoring series; see tracking
+        bug 82948.
+
+        * WebKit.gyp:
+        * src/PlatformSupport.cpp:
+        (WebCore):
+        * src/WorkerContextProxy.cpp: Added.
+        (WebCore):
+        (WebCore::WebCore::WorkerContextProxy::create):
+
+2012-12-05  Mark Pilgrim  <pilg...@chromium.org>
+
         [Chromium][Win] Remove theme-related functions from PlatformSupport
         https://bugs.webkit.org/show_bug.cgi?id=102699
 

Modified: trunk/Source/WebKit/chromium/WebKit.gyp (136740 => 136741)


--- trunk/Source/WebKit/chromium/WebKit.gyp	2012-12-05 20:47:34 UTC (rev 136740)
+++ trunk/Source/WebKit/chromium/WebKit.gyp	2012-12-05 20:49:21 UTC (rev 136741)
@@ -661,6 +661,7 @@
                 'src/WorkerAsyncFileSystemChromium.h',
                 'src/WorkerAsyncFileWriterChromium.cpp',
                 'src/WorkerAsyncFileWriterChromium.h',
+                'src/WorkerContextProxy.cpp',
                 'src/WorkerFileSystemCallbacksBridge.cpp',
                 'src/WorkerFileSystemCallbacksBridge.h',
                 'src/WorkerFileWriterCallbacksBridge.cpp',

Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (136740 => 136741)


--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-12-05 20:47:34 UTC (rev 136740)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-12-05 20:49:21 UTC (rev 136741)
@@ -46,7 +46,6 @@
 #include "WebScreenInfo.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
-#include "WebWorkerClientImpl.h"
 #include "platform/WebAudioBus.h"
 #include "platform/WebData.h"
 #include "platform/WebDragData.h"
@@ -92,15 +91,4 @@
     return true;  // FIXME: There is no need for this function to return a value.
 }
 
-// These are temporary methods that the WebKit layer can use to call to the
-// Glue layer. Once the Glue layer moves entirely into the WebKit layer, these
-// methods will be deleted.
-
-#if ENABLE(WORKERS)
-WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
-{
-    return WebWorkerClientImpl::createWorkerContextProxy(worker);
-}
-#endif
-
 } // namespace WebCore

Added: trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp (0 => 136741)


--- trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp	                        (rev 0)
+++ trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp	2012-12-05 20:49:21 UTC (rev 136741)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR 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.
+ */
+
+#include "config.h"
+#include "WorkerContextProxy.h"
+
+#include "WebWorkerClientImpl.h"
+
+// We are part of the WebKit implementation.
+using namespace WebKit;
+
+namespace WebCore {
+
+#if ENABLE(WORKERS)
+WebCore::WorkerContextProxy* WebCore::WorkerContextProxy::create(WebCore::Worker* worker)
+{
+    return WebWorkerClientImpl::createWorkerContextProxy(worker);
+}
+
+} // namespace WebCore
+
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to