Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138797 => 138798)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-04 15:37:19 UTC (rev 138798)
@@ -1,3 +1,42 @@
+2013-01-04 Mark Pilgrim <[email protected]>
+
+ [Chromium] Update some #includes to use headers in the new Platform directory
+ https://bugs.webkit.org/show_bug.cgi?id=106092
+
+ Reviewed by Kentaro Hara.
+
+ Working towards getting rid of legacy header files in
+ WebKit/chromium/public/ and WebKit/chromium/public/platform/
+
+ * src/AsyncFileSystemChromium.cpp:
+ * src/StorageAreaProxy.cpp:
+ * src/StorageNamespaceProxy.cpp:
+ * src/WebFileSystemCallbacksImpl.cpp:
+ * src/WebGraphicsContext3D.cpp:
+ * src/WebIDBCursorImpl.h:
+ * src/WebIDBDatabaseCallbacksImpl.cpp:
+ * src/WebIDBDatabaseCallbacksImpl.h:
+ * src/WebIDBDatabaseError.cpp:
+ * src/WebIDBDatabaseImpl.h:
+ * src/WebIDBIndexImpl.h:
+ * src/WebIDBKeyPath.cpp:
+ * src/WebIDBMetadata.cpp:
+ * src/WebIDBObjectStoreImpl.h:
+ * src/WebWorkerClientImpl.cpp:
+ * src/WebWorkerRunLoop.cpp:
+ * src/WorkerFileSystemCallbacksBridge.cpp:
+ * tests/AssociatedURLLoaderTest.cpp:
+ * tests/FrameTestHelpers.cpp:
+ * tests/PopupMenuTest.cpp:
+ * tests/URLTestHelpers.cpp:
+ * tests/WebFrameTest.cpp:
+ * tests/WebPageNewSerializerTest.cpp:
+ * tests/WebPageSerializerTest.cpp:
+ * tests/WebURLRequestTest.cpp:
+ * tests/WebURLResponseTest.cpp:
+ * tests/WebUnitTests.h:
+ * tests/WebViewTest.cpp:
+
2013-01-04 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -38,10 +38,10 @@
#include "FileMetadata.h"
#include "SecurityOrigin.h"
#include "ThreadableBlobRegistry.h"
-#include "WebFileInfo.h"
#include "WebFileSystemCallbacksImpl.h"
#include "WebFileWriter.h"
#include <public/Platform.h>
+#include <public/WebFileInfo.h>
#include <public/WebFileSystem.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -42,8 +42,8 @@
#include "WebFrameImpl.h"
#include "WebPermissionClient.h"
-#include "WebStorageArea.h"
#include "WebViewImpl.h"
+#include <public/WebStorageArea.h>
#include <public/WebString.h>
#include <public/WebURL.h>
Modified: trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -32,10 +32,10 @@
#include "SecurityOrigin.h"
#include "StorageAreaProxy.h"
#include "WebKit.h"
-#include "WebStorageNamespace.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
#include <public/Platform.h>
+#include <public/WebStorageNamespace.h>
#include <public/WebString.h>
namespace WebCore {
Modified: trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -36,9 +36,9 @@
#include "AsyncFileSystemChromium.h"
#include "FileMetadata.h"
#include "ScriptExecutionContext.h"
-#include "WebFileInfo.h"
#include "WebFileSystemEntry.h"
#include "WorkerAsyncFileSystemChromium.h"
+#include <public/WebFileInfo.h>
#include <public/WebFileSystem.h>
#include <public/WebString.h>
#include <wtf/Vector.h>
Modified: trunk/Source/WebKit/chromium/src/WebGraphicsContext3D.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebGraphicsContext3D.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebGraphicsContext3D.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "platform/WebGraphicsContext3D.h"
+#include <public/WebGraphicsContext3D.h>
#include "GrGLInterface.h"
Modified: trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -28,9 +28,9 @@
#if ENABLE(INDEXED_DATABASE)
-#include "platform/WebCommon.h"
#include "WebExceptionCode.h"
#include "WebIDBCursor.h"
+#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -29,7 +29,7 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBDatabaseCallbacks.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -30,7 +30,7 @@
#include "WebDOMStringList.h"
#include "WebIDBDatabaseCallbacks.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseError.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseError.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseError.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -34,7 +34,7 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBDatabaseError.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -32,7 +32,7 @@
#include "WebExceptionCode.h"
#include "WebIDBDatabase.h"
#include "WebIDBTransaction.h"
-#include "platform/WebCommon.h"
+#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -28,8 +28,8 @@
#if ENABLE(INDEXED_DATABASE)
-#include "platform/WebCommon.h"
#include "WebIDBIndex.h"
+#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebIDBKeyPath.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBKeyPath.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBKeyPath.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -29,7 +29,7 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBKeyPath.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <public/WebVector.h>
#include <wtf/Vector.h>
Modified: trunk/Source/WebKit/chromium/src/WebIDBMetadata.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBMetadata.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBMetadata.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -30,7 +30,7 @@
#include "IDBMetadata.h"
#include "WebIDBKeyPath.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <public/WebVector.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -28,8 +28,8 @@
#if ENABLE(INDEXED_DATABASE)
-#include "platform/WebCommon.h"
#include "WebIDBObjectStore.h"
+#include <public/WebCommon.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -59,9 +59,9 @@
#include "WebFileSystemCallbacks.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
-#include "WebMessagePortChannel.h"
#include "WebPermissionClient.h"
#include "WebViewImpl.h"
+#include <public/WebMessagePortChannel.h>
#include <public/WebString.h>
#include <public/WebURL.h>
Modified: trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -23,7 +23,7 @@
*/
#include "config.h"
-#include "WebWorkerRunLoop.h"
+#include <public/WebWorkerRunLoop.h>
#if ENABLE(WORKERS)
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -36,7 +36,6 @@
#include "CrossThreadTask.h"
#include "KURL.h"
#include "WebCommonWorkerClient.h"
-#include "WebFileInfo.h"
#include "WebFileSystemCallbacks.h"
#include "WebFileSystemEntry.h"
#include "WebWorkerBase.h"
@@ -44,6 +43,7 @@
#include "WorkerLoaderProxy.h"
#include "WorkerScriptController.h"
#include "WorkerThread.h"
+#include <public/WebFileInfo.h>
#include <public/WebString.h>
#include <public/WebURL.h>
#include <wtf/MainThread.h>
Modified: trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -35,12 +35,12 @@
#include "WebFrameClient.h"
#include "WebURLLoaderOptions.h"
#include "WebView.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
-#include "platform/WebURLLoader.h"
-#include "platform/WebURLLoaderClient.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
+#include <public/WebURLLoader.h>
+#include <public/WebURLLoaderClient.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <wtf/text/WTFString.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/FrameTestHelpers.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/FrameTestHelpers.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/FrameTestHelpers.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -36,11 +36,11 @@
#include "WebFrame.h"
#include "WebFrameClient.h"
#include "WebSettings.h"
-#include "platform/WebString.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
#include "WebView.h"
#include "WebViewClient.h"
+#include <public/WebString.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <webkit/support/webkit_support.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -53,14 +53,14 @@
#include "WebPopupMenuImpl.h"
#include "WebScreenInfo.h"
#include "WebSettings.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
#include "WebView.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
#include "v8.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
using namespace WebCore;
using namespace WebKit;
Modified: trunk/Source/WebKit/chromium/tests/URLTestHelpers.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/URLTestHelpers.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/URLTestHelpers.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -31,9 +31,9 @@
#include "config.h"
#include "URLTestHelpers.h"
-#include "platform/WebURLResponse.h"
#include <public/WebString.h>
#include <public/WebURL.h>
+#include <public/WebURLResponse.h>
#include <webkit/support/webkit_support.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -54,10 +54,10 @@
#include "WebSettings.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
-#include "platform/WebFloatRect.h"
-#include "platform/WebURLResponse.h"
#include "v8.h"
#include <gtest/gtest.h>
+#include <public/WebFloatRect.h>
+#include <public/WebURLResponse.h>
#include <webkit/support/webkit_support.h>
using namespace WebKit;
Modified: trunk/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebPageNewSerializerTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -36,11 +36,11 @@
#include "WebPageSerializer.h"
#include "WebScriptSource.h"
#include "WebSettings.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
#include "WebView.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <gtest/gtest.h>
#include <webkit/support/webkit_support.h>
Modified: trunk/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -34,11 +34,11 @@
#include "URLTestHelpers.h"
#include "WebFrame.h"
#include "WebFrameClient.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
#include "WebView.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <gtest/gtest.h>
#include <webkit/support/webkit_support.h>
Modified: trunk/Source/WebKit/chromium/tests/WebURLRequestTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebURLRequestTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebURLRequestTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -30,7 +30,7 @@
#include "config.h"
-#include "platform/WebURLRequest.h"
+#include <public/WebURLRequest.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/WebURLResponseTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebURLResponseTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebURLResponseTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -30,7 +30,7 @@
#include "config.h"
-#include "platform/WebURLResponse.h"
+#include <public/WebURLResponse.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/WebUnitTests.h (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebUnitTests.h 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebUnitTests.h 2013-01-04 15:37:19 UTC (rev 138798)
@@ -31,7 +31,7 @@
#ifndef WebUnitTests_h
#define WebUnitTests_h
-#include "platform/WebCommon.h"
+#include <public/WebCommon.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/WebViewTest.cpp (138797 => 138798)
--- trunk/Source/WebKit/chromium/tests/WebViewTest.cpp 2013-01-04 15:25:35 UTC (rev 138797)
+++ trunk/Source/WebKit/chromium/tests/WebViewTest.cpp 2013-01-04 15:37:19 UTC (rev 138798)
@@ -44,10 +44,10 @@
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebInputEvent.h"
-#include "platform/WebSize.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
#include <gtest/gtest.h>
+#include <public/WebSize.h>
#include <webkit/support/webkit_support.h>
using namespace WebKit;
