Diff
Modified: trunk/Tools/ChangeLog (140564 => 140565)
--- trunk/Tools/ChangeLog 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/ChangeLog 2013-01-23 19:55:35 UTC (rev 140565)
@@ -1,3 +1,44 @@
+2013-01-23 Mark Pilgrim <[email protected]>
+
+ [Chromium] Update some #includes in DumpRenderTree for headers in the new Platform directory
+ https://bugs.webkit.org/show_bug.cgi?id=107145
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series; see tracking bug 82948.
+
+ * DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
+ * DumpRenderTree/chromium/DRTDevToolsAgent.h:
+ * DumpRenderTree/chromium/DRTDevToolsClient.h:
+ * DumpRenderTree/chromium/DRTTestRunner.cpp:
+ * DumpRenderTree/chromium/DRTTestRunner.h:
+ * DumpRenderTree/chromium/MockWebPrerenderingSupport.h:
+ * DumpRenderTree/chromium/MockWebSpeechInputController.cpp:
+ * DumpRenderTree/chromium/MockWebSpeechInputController.h:
+ * DumpRenderTree/chromium/NotificationPresenter.cpp:
+ * DumpRenderTree/chromium/TestNavigationController.h:
+ * DumpRenderTree/chromium/TestRunner/src/AccessibilityControllerChromium.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/CppBoundClass.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
+ (WebTestRunner):
+ * DumpRenderTree/chromium/TestRunner/src/EventSender.h:
+ * DumpRenderTree/chromium/TestRunner/src/GamepadController.h:
+ * DumpRenderTree/chromium/TestRunner/src/TestDelegate.h:
+ * DumpRenderTree/chromium/TestRunner/src/TestInterfaces.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+ * DumpRenderTree/chromium/TestRunner/src/TextInputController.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp:
+ * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+ * DumpRenderTree/chromium/TestShell.cpp:
+ * DumpRenderTree/chromium/WebThemeEngineDRTMac.h:
+ * DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:
+ * DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp:
+ * DumpRenderTree/chromium/WebThemeEngineDRTWin.h:
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+
2013-01-23 Jochen Eisinger <[email protected]>
[chromium] Use after free in plugins/geturlnotify-during-document-teardown.html
Modified: trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -34,10 +34,10 @@
#include "DRTDevToolsClient.h"
#include "Task.h"
-#include "platform/WebCString.h"
#include "WebDevToolsAgent.h"
#include "WebView.h"
#include "webkit/support/webkit_support.h"
+#include <public/WebCString.h>
using namespace WebKit;
using namespace WebTestRunner;
Modified: trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/DRTDevToolsAgent.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -33,7 +33,7 @@
#include "WebDevToolsAgentClient.h"
#include "WebTask.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
Modified: trunk/Tools/DumpRenderTree/chromium/DRTDevToolsClient.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/DRTDevToolsClient.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/DRTDevToolsClient.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -33,7 +33,7 @@
#include "WebDevToolsFrontendClient.h"
#include "WebTask.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
namespace WebKit {
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -49,21 +49,21 @@
#include "WebPrintParams.h"
#include "WebScriptSource.h"
#include "WebSecurityPolicy.h"
+#include "WebSerializedScriptValue.h"
#include "WebSettings.h"
#include "WebSurroundingText.h"
#include "WebView.h"
#include "WebViewHost.h"
#include "WebWorkerInfo.h"
-#include "platform/WebData.h"
-#include "platform/WebSerializedScriptValue.h"
-#include "platform/WebSize.h"
-#include "platform/WebURL.h"
#include "v8/include/v8.h"
#include "webkit/support/webkit_support.h"
#include <algorithm>
#include <cctype>
#include <cstdlib>
#include <limits>
+#include <public/WebData.h>
+#include <public/WebSize.h>
+#include <public/WebURL.h>
#include <sstream>
#include <wtf/OwnArrayPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -43,10 +43,10 @@
#define DRTTestRunner_h
#include "TestRunner/src/TestRunner.h"
+#include "WebArrayBufferView.h"
#include "WebTask.h"
-#include "platform/WebArrayBufferView.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
#include <wtf/Deque.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebPrerenderingSupport.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/MockWebPrerenderingSupport.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebPrerenderingSupport.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -31,7 +31,7 @@
#ifndef MockWebPrerenderingSupport_h
#define MockWebPrerenderingSupport_h
-#include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h"
+#include <public/WebPrerenderingSupport.h>
class MockWebPrerenderingSupport : public WebKit::WebPrerenderingSupport {
public:
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -28,8 +28,8 @@
#include "Task.h"
#include "WebSpeechInputListener.h"
-#include "platform/WebCString.h"
-#include "platform/WebVector.h"
+#include <public/WebCString.h>
+#include <public/WebVector.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -29,9 +29,9 @@
#if ENABLE(INPUT_SPEECH)
#include "WebTask.h"
-#include "platform/WebRect.h"
#include "WebSpeechInputController.h"
#include "WebSpeechInputResult.h"
+#include <public/WebRect.h>
#include <wtf/Compiler.h>
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/NotificationPresenter.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -37,10 +37,10 @@
#include "WebNotification.h"
#include "WebNotificationPermissionCallback.h"
#include "WebSecurityOrigin.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
#include "googleurl/src/gurl.h"
#include <public/Platform.h>
+#include <public/WebString.h>
+#include <public/WebURL.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestNavigationController.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestNavigationController.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestNavigationController.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -33,9 +33,9 @@
#include "WebDataSource.h"
#include "WebHistoryItem.h"
-#include "platform/WebString.h"
-#include "platform/WebURL.h"
#include "webkit/support/webkit_support.h"
+#include <public/WebString.h>
+#include <public/WebURL.h>
#include <string>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityControllerChromium.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityControllerChromium.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityControllerChromium.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -37,7 +37,7 @@
#include "WebFrame.h"
#include "WebNode.h"
#include "WebView.h"
-#include "platform/WebCString.h"
+#include <public/WebCString.h>
using namespace WebKit;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -32,10 +32,10 @@
#include "AccessibilityUIElementChromium.h"
#include "WebAccessibilityObject.h"
-#include "platform/WebCString.h"
-#include "platform/WebPoint.h"
-#include "platform/WebRect.h"
-#include "platform/WebString.h"
+#include <public/WebCString.h>
+#include <public/WebPoint.h>
+#include <public/WebRect.h>
+#include <public/WebString.h>
#include <wtf/Assertions.h>
#include <wtf/StringExtras.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/CppBoundClass.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/CppBoundClass.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/CppBoundClass.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -44,7 +44,7 @@
#include "WebBindings.h"
#include "WebFrame.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
#include <wtf/Assertions.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -51,10 +51,10 @@
#include "WebEventSender.h"
#include "WebTouchPoint.h"
#include "WebView.h"
-#include "platform/WebDragData.h"
-#include "platform/WebPoint.h"
-#include "platform/WebString.h"
-#include "platform/WebVector.h"
+#include <public/WebDragData.h>
+#include <public/WebPoint.h>
+#include <public/WebString.h>
+#include <public/WebVector.h>
#include <wtf/Deque.h>
#include <wtf/StringExtras.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -41,7 +41,7 @@
#include "WebDragOperation.h"
#include "WebInputEvent.h"
#include "WebTask.h"
-#include "platform/WebPoint.h"
+#include <public/WebPoint.h>
namespace WebKit {
class WebDragData;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/GamepadController.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/GamepadController.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/GamepadController.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -32,7 +32,7 @@
#define GamepadController_h
#include "CppBoundClass.h"
-#include "platform/WebGamepads.h"
+#include <public/WebGamepads.h>
namespace WebKit {
class WebGamepads;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestDelegate.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -31,8 +31,8 @@
#ifndef TestDelegate_h
#define TestDelegate_h
-#include "platform/WebString.h"
-#include "platform/WebVector.h"
+#include <public/WebString.h>
+#include <public/WebVector.h>
namespace WebKit {
struct WebContextMenuData;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestInterfaces.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestInterfaces.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestInterfaces.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -35,7 +35,7 @@
#include "EventSender.h"
#include "GamepadController.h"
#include "TextInputController.h"
-#include "platform/WebString.h"
+#include <public/WebString.h>
using WebKit::WebFrame;
using WebKit::WebString;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -47,15 +47,15 @@
#include "WebPreferences.h"
#include "WebScriptSource.h"
#include "WebSecurityPolicy.h"
+#include "WebSerializedScriptValue.h"
#include "WebSettings.h"
#include "WebSurroundingText.h"
#include "WebTask.h"
#include "WebTestDelegate.h"
#include "WebView.h"
#include "WebWorkerInfo.h"
-#include "platform/WebPoint.h"
-#include "platform/WebSerializedScriptValue.h"
#include "v8/include/v8.h"
+#include <public/WebPoint.h>
#include <wtf/OwnArrayPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -34,11 +34,11 @@
#define TestRunner_h
#include "CppBoundClass.h"
+#include "WebArrayBufferView.h"
#include "WebDeliveredIntentClient.h"
#include "WebTask.h"
#include "WebTestRunner.h"
-#include "platform/WebArrayBufferView.h"
-#include "platform/WebURL.h"
+#include <public/WebURL.h>
namespace WebKit {
class WebView;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TextInputController.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TextInputController.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TextInputController.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -37,8 +37,8 @@
#include "WebInputEvent.h"
#include "WebRange.h"
#include "WebView.h"
-#include "platform/WebString.h"
-#include "platform/WebVector.h"
+#include <public/WebString.h>
+#include <public/WebVector.h>
#include <string>
#include <wtf/StringExtras.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPermissions.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -32,8 +32,8 @@
#include "WebPermissions.h"
#include "WebTestDelegate.h"
-#include "platform/WebCString.h"
-#include "platform/WebURL.h"
+#include <public/WebCString.h>
+#include <public/WebURL.h>
namespace WebTestRunner {
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestPlugin.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -33,11 +33,11 @@
#include "WebPluginParams.h"
#include "WebTestDelegate.h"
#include "WebTouchPoint.h"
-#include "platform/WebGraphicsContext3D.h"
-#include "public/WebCompositorSupport.h"
-#include "public/WebExternalTextureLayer.h"
-#include "public/WebExternalTextureLayerClient.h"
#include <public/Platform.h>
+#include <public/WebCompositorSupport.h>
+#include <public/WebExternalTextureLayer.h>
+#include <public/WebExternalTextureLayerClient.h>
+#include <public/WebGraphicsContext3D.h>
#include <wtf/Assertions.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -48,9 +48,9 @@
#include "WebTestInterfaces.h"
#include "WebTestRunner.h"
#include "WebView.h"
-#include "platform/WebCString.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
+#include <public/WebCString.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <wtf/StringExtras.h>
using namespace WebKit;
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -35,6 +35,7 @@
#include "DRTDevToolsClient.h"
#include "DRTTestRunner.h"
#include "MockWebPrerenderingSupport.h"
+#include "WebArrayBufferView.h"
#include "WebCache.h"
#include "WebDataSource.h"
#include "WebDocument.h"
@@ -49,7 +50,6 @@
#include "WebTestProxy.h"
#include "WebView.h"
#include "WebViewHost.h"
-#include "platform/WebArrayBufferView.h"
#include "skia/ext/platform_canvas.h"
#include "webkit/support/webkit_support.h"
#include "webkit/support/webkit_support_gfx.h"
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -30,7 +30,7 @@
#ifndef WebThemeEngineDRTMac_h
#define WebThemeEngineDRTMac_h
-#include "third_party/WebKit/Source/Platform/chromium/public/mac/WebThemeEngine.h"
+#include <public/mac/WebThemeEngine.h>
class WebThemeEngineDRTMac : public WebKit::WebThemeEngine {
public:
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm 2013-01-23 19:55:35 UTC (rev 140565)
@@ -30,9 +30,9 @@
#include "WebThemeEngineDRTMac.h"
+#include <public/WebCanvas.h>
+#include <public/WebRect.h>
#include "skia/ext/skia_utils_mac.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
#import <AppKit/NSAffineTransform.h>
#import <AppKit/NSGraphicsContext.h>
#import <AppKit/NSScroller.h>
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -31,9 +31,9 @@
#include "config.h"
#include "WebThemeEngineDRTWin.h"
-#include "platform/WebRect.h"
#include "WebThemeControlDRTWin.h"
#include "third_party/skia/include/core/SkRect.h"
+#include <public/WebRect.h>
// Although all this code is generic, we include these headers
// to pull in the Windows #defines for the parts and states of
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.h (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.h 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTWin.h 2013-01-23 19:55:35 UTC (rev 140565)
@@ -47,7 +47,7 @@
#ifndef WebThemeEngineDRTWin_h
#define WebThemeEngineDRTWin_h
-#include "platform/win/WebThemeEngine.h"
+#include <public/win/WebThemeEngine.h>
#include <wtf/Noncopyable.h>
class WebThemeEngineDRTWin : public WebKit::WebThemeEngine {
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (140564 => 140565)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-23 19:49:52 UTC (rev 140564)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-23 19:55:35 UTC (rev 140565)
@@ -58,12 +58,12 @@
#include "WebPrintParams.h"
#include "WebRange.h"
#include "WebScreenInfo.h"
+#include "WebSerializedScriptValue.h"
#include "WebStorageNamespace.h"
#include "WebTestPlugin.h"
#include "WebUserMediaClientMock.h"
#include "WebView.h"
#include "WebWindowFeatures.h"
-#include "platform/WebSerializedScriptValue.h"
#include "skia/ext/platform_canvas.h"
#include "webkit/support/test_media_stream_client.h"
#include "webkit/support/webkit_support.h"
