Attachment 178207 Details for Bug 104151 – Patch

[patch] Patch

bug-104151-20121207084757.patch (text/plain), 4.65 KB, created by Mark Pilgrim (Google) on 2012-12-07 05:51:10 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-12-07 05:51:10 PST

Size: 4.65 KB

patch

obsolete

>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 136948)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,21 @@
>+2012-12-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move WorkerContextProxy::create out of PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=104151
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-07  Ilya Tikhonovsky  <loislo@chromium.org>
> 
>         Unreviewed roll crhomium to r171707.
>Index: Source/WebKit/chromium/WebKit.gyp
>===================================================================
>--- Source/WebKit/chromium/WebKit.gyp	(revision 136948)
>+++ Source/WebKit/chromium/WebKit.gyp	(working copy)
>@@ -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',
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 136948)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -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"
>@@ -205,15 +204,4 @@ void PlatformSupport::paintProgressBar(
> 
> #endif
> 
>-// 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
>Index: Source/WebKit/chromium/src/WorkerContextProxy.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WorkerContextProxy.cpp	(revision 0)
>+++ Source/WebKit/chromium/src/WorkerContextProxy.cpp	(revision 0)
>@@ -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)
>+WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
>+{
>+    return WebWorkerClientImpl::createWorkerContextProxy(worker);
>+}
>+
>+} // namespace WebCore
>+
>+#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 104151: 177803 | 178206 | 178207