Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (103836 => 103837)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-30 08:43:46 UTC (rev 103837)
@@ -1,3 +1,18 @@
+2011-12-30 Dmitry Lomov <dslo...@google.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=75373
+ [Chromium] Remove WebWorkerClient.h
+ After coordinated patch in chromium, WebWorkerClient alias for WebSharedWorkerClient is no longer needed.
+
+ Reviewed by Adam Barth.
+
+ * WebKit.gyp:
+ * public/WebFrameClient.h:
+ * public/WebWorkerClient.h: Removed.
+ * src/WebSharedWorkerImpl.h:
+ * src/WebWorkerBase.cpp:
+ * src/WebWorkerClientImpl.h:
+
2011-12-29 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r103831.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (103836 => 103837)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-30 08:43:46 UTC (rev 103837)
@@ -265,7 +265,6 @@
'public/WebWidget.h',
'public/WebWidgetClient.h',
'public/WebWorker.h',
- 'public/WebWorkerClient.h',
'public/WebWorkerRunLoop.h',
'public/android/WebInputEventFactory.h',
'public/android/WebSandboxSupport.h',
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (103836 => 103837)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-12-30 08:43:46 UTC (rev 103837)
@@ -36,7 +36,6 @@
#include "WebNavigationType.h"
#include "WebStorageQuotaType.h"
#include "WebTextDirection.h"
-#include "WebWorkerClient.h"
#include "platform/WebCommon.h"
#include "platform/WebFileSystem.h"
#include "platform/WebURLError.h"
Deleted: trunk/Source/WebKit/chromium/public/WebWorkerClient.h (103836 => 103837)
--- trunk/Source/WebKit/chromium/public/WebWorkerClient.h 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/public/WebWorkerClient.h 2011-12-30 08:43:46 UTC (rev 103837)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-#ifndef WebWorkerClient_h
-#define WebWorkerClient_h
-
-#include "WebSharedWorkerClient.h"
-
-#define WebWorkerClient WebSharedWorkerClient
-
-#endif
Modified: trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h (103836 => 103837)
--- trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h 2011-12-30 08:43:46 UTC (rev 103837)
@@ -37,8 +37,8 @@
#include "ScriptExecutionContext.h"
#include "WebCommonWorkerClient.h"
#include "WebFrameClient.h"
+#include "WebSharedWorkerClient.h"
#include "WebWorkerBase.h"
-#include "WebWorkerClient.h"
#include "WorkerLoaderProxy.h"
#include "WorkerObjectProxy.h"
#include "WorkerThread.h"
Modified: trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp (103836 => 103837)
--- trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp 2011-12-30 08:43:46 UTC (rev 103837)
@@ -33,8 +33,6 @@
#include "CrossThreadTask.h"
-#include "WebWorkerClient.h"
-
#include "WorkerContext.h"
#include "WorkerLoaderProxy.h"
#include "WorkerThread.h"
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h (103836 => 103837)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-12-30 06:24:22 UTC (rev 103836)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-12-30 08:43:46 UTC (rev 103837)
@@ -41,7 +41,6 @@
#include "platform/WebFileSystem.h"
#include "WebWorkerBase.h"
-#include "WebWorkerClient.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/RefPtr.h>
