Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125107 => 125108)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 23:27:47 UTC (rev 125108)
@@ -1,5 +1,37 @@
2012-08-08 James Robinson <[email protected]>
+ [chromium] Clean up WebKit.h and WebKitPlatformSupport.h includes in chromium/src
+ https://bugs.webkit.org/show_bug.cgi?id=93539
+
+ Reviewed by Adam Barth.
+
+ Most of these files don't need either WebKit.h or WebKitPlatformSupport.h. Some need <public/Platform.h>, and
+ some are relying on the forwarding headers. This updates includes to what is actually needed and points platform
+ includes at <public/Foo.h> instead of "platform/Foo.h" where possible.
+
+ * src/ApplicationCacheHostInternal.h:
+ * src/AssociatedURLLoader.cpp:
+ * src/AsyncFileSystemChromium.cpp:
+ (WebCore::AsyncFileSystemChromium::AsyncFileSystemChromium):
+ * src/BlobRegistryProxy.cpp:
+ * src/ChromiumCurrentTime.cpp:
+ * src/ChromiumOSRandomSource.cpp:
+ * src/ChromiumThreading.cpp:
+ * src/EditorClientImpl.cpp:
+ * src/FrameLoaderClientImpl.cpp:
+ * src/IDBFactoryBackendProxy.cpp:
+ * src/LocalizedStrings.cpp:
+ * src/PlatformMessagePortChannel.cpp:
+ * src/WebCompositorInputHandlerImpl.cpp:
+ * src/WebMediaPlayerClientImpl.cpp:
+ * src/WebPluginContainerImpl.cpp:
+ * src/WebViewImpl.cpp:
+ * src/WebWorkerClientImpl.cpp:
+ * src/WorkerAsyncFileSystemChromium.cpp:
+ * src/WorkerFileWriterCallbacksBridge.cpp:
+
+2012-08-08 James Robinson <[email protected]>
+
[chromium] Clean up includes in compositor unit tests
https://bugs.webkit.org/show_bug.cgi?id=93531
Modified: trunk/Source/WebKit/chromium/src/ApplicationCacheHostInternal.h (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/ApplicationCacheHostInternal.h 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/ApplicationCacheHostInternal.h 2012-08-08 23:27:47 UTC (rev 125108)
@@ -35,9 +35,7 @@
#include "WebApplicationCacheHostClient.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebURL.h"
+#include <public/WebURL.h>
namespace WebCore {
Modified: trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -40,16 +40,14 @@
#include "WebApplicationCacheHost.h"
#include "WebDataSource.h"
#include "WebFrameImpl.h"
-#include "WebKit.h"
#include "WrappedResourceRequest.h"
#include "WrappedResourceResponse.h"
#include "XMLHttpRequest.h"
-#include "platform/WebHTTPHeaderVisitor.h"
-#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebString.h"
-#include "platform/WebURLError.h"
-#include "platform/WebURLLoaderClient.h"
-#include "platform/WebURLRequest.h"
+#include <public/WebHTTPHeaderVisitor.h>
+#include <public/WebString.h>
+#include <public/WebURLError.h>
+#include <public/WebURLLoaderClient.h>
+#include <public/WebURLRequest.h>
#include <wtf/HashSet.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -41,9 +41,6 @@
#include "WebFileInfo.h"
#include "WebFileSystemCallbacksImpl.h"
#include "WebFileWriter.h"
-#include "WebKit.h"
-#include "platform/WebFileSystem.h"
-#include "platform/WebKitPlatformSupport.h"
#include <public/Platform.h>
#include <public/WebFileSystem.h>
#include <wtf/text/CString.h>
@@ -102,7 +99,7 @@
}
AsyncFileSystemChromium::AsyncFileSystemChromium()
- : m_webFileSystem(WebKit::webKitPlatformSupport()->fileSystem())
+ : m_webFileSystem(WebKit::Platform::current()->fileSystem())
{
ASSERT(m_webFileSystem);
}
Modified: trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/BlobRegistryProxy.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -37,11 +37,10 @@
#include "BlobData.h"
#include "KURL.h"
#include "ResourceHandle.h"
-#include "WebKit.h"
-#include "platform/WebURL.h"
#include <public/Platform.h>
#include <public/WebBlobData.h>
#include <public/WebBlobRegistry.h>
+#include <public/WebURL.h>
#include <wtf/MainThread.h>
#include <wtf/StdLibExtras.h>
Modified: trunk/Source/WebKit/chromium/src/ChromiumCurrentTime.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/ChromiumCurrentTime.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/ChromiumCurrentTime.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -29,11 +29,10 @@
*/
#include "config.h"
+
+#include <public/Platform.h>
#include <wtf/CurrentTime.h>
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-
namespace WTF {
double currentTime()
Modified: trunk/Source/WebKit/chromium/src/ChromiumOSRandomSource.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/ChromiumOSRandomSource.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/ChromiumOSRandomSource.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -31,8 +31,6 @@
#include "config.h"
#include <wtf/OSRandomSource.h>
-#include "WebKit.h"
-
#include <public/Platform.h>
namespace WTF {
Modified: trunk/Source/WebKit/chromium/src/ChromiumThreading.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/ChromiumThreading.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/ChromiumThreading.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -29,13 +29,10 @@
*/
#include "config.h"
+
+#include <public/Platform.h>
#include <wtf/chromium/ChromiumThreading.h>
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-
-#include <wtf/MainThread.h>
-
namespace WTF {
void ChromiumThreading::callOnMainThread(void (*func)(void*), void* context)
Modified: trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -49,9 +49,9 @@
#include "WebElement.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
-#include "WebKit.h"
#include "WebInputElement.h"
#include "WebInputEventConversion.h"
+#include "WebKit.h"
#include "WebNode.h"
#include "WebPermissionClient.h"
#include "WebRange.h"
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -52,7 +52,6 @@
#include "MessageEvent.h"
#include "MouseEvent.h"
#include "Page.h"
-#include "PlatformString.h"
#include "PluginData.h"
#include "PluginDataChromium.h"
#include "ProgressTracker.h"
@@ -69,7 +68,6 @@
#include "WebFrameImpl.h"
#include "WebIntentRequest.h"
#include "WebIntentServiceInfo.h"
-#include "WebKit.h"
#include "WebNode.h"
#include "WebPermissionClient.h"
#include "WebPlugin.h"
@@ -83,14 +81,15 @@
#include "WindowFeatures.h"
#include "WrappedResourceRequest.h"
#include "WrappedResourceResponse.h"
-#include "platform/WebKitPlatformSupport.h"
#include "platform/WebURL.h"
#include "platform/WebURLError.h"
#include "platform/WebVector.h"
+#include <public/Platform.h>
#include <public/WebMimeRegistry.h>
#include <wtf/StringExtras.h>
#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
#if USE(V8)
#include <v8.h>
Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -43,9 +43,7 @@
#include "WebIDBDatabaseError.h"
#include "WebIDBFactory.h"
#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
#include "WebPermissionClient.h"
-#include "platform/WebVector.h"
#include "WebViewImpl.h"
#include "WebWorkerBase.h"
#include "WebWorkerClientImpl.h"
@@ -53,6 +51,8 @@
#include "WorkerLoaderProxy.h"
#include "WorkerScriptController.h"
#include "WorkerThread.h"
+#include "platform/WebKitPlatformSupport.h"
+#include <public/WebVector.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -34,11 +34,9 @@
#include "IntSize.h"
#include "NotImplemented.h"
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebString.h"
-
+#include <public/Platform.h>
#include <public/WebLocalizedString.h>
+#include <public/WebString.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/chromium/src/PlatformMessagePortChannel.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/PlatformMessagePortChannel.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/PlatformMessagePortChannel.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -35,8 +35,6 @@
#include "ScriptExecutionContext.h"
#include "SerializedScriptValue.h"
-#include "WebKit.h"
-
#include <public/Platform.h>
#include <public/WebMessagePortChannel.h>
#include <public/WebString.h>
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -33,10 +33,8 @@
#include "WebCompositorImpl.h"
#include "WebCompositorInputHandlerClient.h"
#include "WebInputEvent.h"
-#include "WebKit.h"
#include "cc/CCActiveGestureAnimation.h"
#include "cc/CCProxy.h"
-#include "platform/WebKitPlatformSupport.h"
#include <wtf/ThreadingPrimitives.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -23,7 +23,6 @@
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebHelperPluginImpl.h"
-#include "WebKit.h"
#include "WebMediaPlayer.h"
#include "WebViewImpl.h"
#include <public/Platform.h>
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -39,14 +39,7 @@
#include "WebElement.h"
#include "WebInputEvent.h"
#include "WebInputEventConversion.h"
-#include "WebKit.h"
#include "WebPlugin.h"
-#include "platform/WebRect.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
-#include "platform/WebURLError.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebVector.h"
#include "WebViewImpl.h"
#include "WrappedResourceResponse.h"
@@ -78,6 +71,12 @@
#include "WheelEvent.h"
#include <public/Platform.h>
#include <public/WebClipboard.h>
+#include <public/WebRect.h>
+#include <public/WebString.h>
+#include <public/WebURL.h>
+#include <public/WebURLError.h>
+#include <public/WebURLRequest.h>
+#include <public/WebVector.h>
#if ENABLE(GESTURE_EVENTS)
#include "PlatformGestureEvent.h"
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -132,7 +132,6 @@
#include "WebInputElement.h"
#include "WebInputEvent.h"
#include "WebInputEventConversion.h"
-#include "WebKit.h"
#include "WebMediaPlayerAction.h"
#include "WebNode.h"
#include "WebPagePopupImpl.h"
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -59,13 +59,11 @@
#include "PlatformMessagePortChannel.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
#include "WebMessagePortChannel.h"
#include "WebPermissionClient.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
#include "WebViewImpl.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -40,8 +40,6 @@
#include "NotImplemented.h"
#include "WebFileSystemCallbacksImpl.h"
#include "WebFileWriter.h"
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
#include "WebWorkerBase.h"
#include "WorkerAsyncFileWriterChromium.h"
#include "WorkerContext.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (125107 => 125108)
--- trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2012-08-08 23:23:36 UTC (rev 125107)
+++ trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2012-08-08 23:27:47 UTC (rev 125108)
@@ -35,14 +35,13 @@
#include "AsyncFileWriterClient.h"
#include "CrossThreadTask.h"
-#include "platform/WebCString.h"
#include "WebFileWriter.h"
-#include "WebKit.h"
#include "WebWorkerBase.h"
#include "WorkerContext.h"
#include "WorkerLoaderProxy.h"
#include "WorkerThread.h"
#include <public/Platform.h>
+#include <public/WebCString.h>
#include <public/WebFileSystem.h>
#include <wtf/MainThread.h>
#include <wtf/Threading.h>
