Title: [136748] trunk/Source/WebKit/chromium
- Revision
- 136748
- Author
- [email protected]
- Date
- 2012-12-05 13:16:43 -0800 (Wed, 05 Dec 2012)
Log Message
Unreviewed, rolling out r136741.
http://trac.webkit.org/changeset/136741
https://bugs.webkit.org/show_bug.cgi?id=104151
Broke Chrome/Win build.
* WebKit.gyp:
* src/PlatformSupport.cpp:
(WebCore):
(WebCore::WorkerContextProxy::create):
* src/WorkerContextProxy.cpp: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136747 => 136748)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 21:14:17 UTC (rev 136747)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 21:16:43 UTC (rev 136748)
@@ -1,3 +1,17 @@
+2012-12-05 Stephen White <[email protected]>
+
+ Unreviewed, rolling out r136741.
+ http://trac.webkit.org/changeset/136741
+ https://bugs.webkit.org/show_bug.cgi?id=104151
+
+ Broke Chrome/Win build.
+
+ * WebKit.gyp:
+ * src/PlatformSupport.cpp:
+ (WebCore):
+ (WebCore::WorkerContextProxy::create):
+ * src/WorkerContextProxy.cpp: Removed.
+
2012-12-05 Mark Pilgrim <[email protected]>
[Chromium] Move WorkerContextProxy::create out of PlatformSupport
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (136747 => 136748)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-05 21:14:17 UTC (rev 136747)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-05 21:16:43 UTC (rev 136748)
@@ -661,7 +661,6 @@
'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 (136747 => 136748)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-12-05 21:14:17 UTC (rev 136747)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-12-05 21:16:43 UTC (rev 136748)
@@ -46,6 +46,7 @@
#include "WebScreenInfo.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
+#include "WebWorkerClientImpl.h"
#include "platform/WebAudioBus.h"
#include "platform/WebData.h"
#include "platform/WebDragData.h"
@@ -91,4 +92,15 @@
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
Deleted: trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp (136747 => 136748)
--- trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp 2012-12-05 21:14:17 UTC (rev 136747)
+++ trunk/Source/WebKit/chromium/src/WorkerContextProxy.cpp 2012-12-05 21:16:43 UTC (rev 136748)
@@ -1,49 +0,0 @@
-/*
- * 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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
