Diff
Modified: trunk/Source/Platform/ChangeLog (125338 => 125339)
--- trunk/Source/Platform/ChangeLog 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/Platform/ChangeLog 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,3 +1,14 @@
+2012-08-09 James Robinson <[email protected]>
+
+ [chromium] Remove forwarding headers for compositor-related WebKit API and update includes
+ https://bugs.webkit.org/show_bug.cgi?id=93669
+
+ Reviewed by Adam Barth.
+
+ Removes a no-longer-necessary transitional define.
+
+ * chromium/public/WebCompositor.h:
+
2012-08-06 Nat Duca <[email protected]>
[chromium] Expose CCGraphicsContext as WebCompositorOutputSurface
Modified: trunk/Source/Platform/chromium/public/WebCompositor.h (125338 => 125339)
--- trunk/Source/Platform/chromium/public/WebCompositor.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/Platform/chromium/public/WebCompositor.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -26,8 +26,6 @@
#ifndef WebCompositor_h
#define WebCompositor_h
-#define WEBCOMPOSITOR_OWNS_SETTINGS 1
-
#include "WebCommon.h"
namespace WebKit {
Modified: trunk/Source/WebCore/ChangeLog (125338 => 125339)
--- trunk/Source/WebCore/ChangeLog 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebCore/ChangeLog 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,3 +1,14 @@
+2012-08-09 James Robinson <[email protected]>
+
+ [chromium] Remove forwarding headers for compositor-related WebKit API and update includes
+ https://bugs.webkit.org/show_bug.cgi?id=93669
+
+ Reviewed by Adam Barth.
+
+ Updates all includes for compositor-related headers to refer consistently to the Platform API location.
+
+ * platform/chromium/support/WebCompositorImpl.h:
+
2012-08-10 James Robinson <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WebCore/platform/chromium/support/WebCompositorImpl.h (125338 => 125339)
--- trunk/Source/WebCore/platform/chromium/support/WebCompositorImpl.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebCore/platform/chromium/support/WebCompositorImpl.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -26,7 +26,7 @@
#ifndef WebCompositorImpl_h
#define WebCompositorImpl_h
-#include "WebCompositor.h"
+#include <public/WebCompositor.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
Modified: trunk/Source/WebKit/chromium/ChangeLog (125338 => 125339)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,3 +1,35 @@
+2012-08-09 James Robinson <[email protected]>
+
+ [chromium] Remove forwarding headers for compositor-related WebKit API and update includes
+ https://bugs.webkit.org/show_bug.cgi?id=93669
+
+ Reviewed by Adam Barth.
+
+ This updates all includes for compositor-related headers to refer consistently to the Platform API location and
+ removes the now-unneeded forwarding headers in the client API location. I also updated and resorted other
+ platform API includes in modified header blocks.
+
+ * WebKit.gyp:
+ * public/WebCompositor.h: Removed.
+ * public/platform/WebContentLayer.h: Removed.
+ * public/platform/WebContentLayerClient.h: Removed.
+ * public/platform/WebExternalTextureLayer.h: Removed.
+ * public/platform/WebLayer.h: Removed.
+ * public/platform/WebLayerTreeView.h: Removed.
+ * public/platform/WebLayerTreeViewClient.h: Removed.
+ * public/platform/WebSolidColorLayer.h: Removed.
+ * src/WebCompositorInputHandlerImpl.h:
+ * src/WebContentLayerImpl.cpp:
+ * src/WebLayer.cpp:
+ * src/WebLayerTreeView.cpp:
+ * src/WebLayerTreeViewImpl.cpp:
+ * src/WebLayerTreeViewImpl.h:
+ * src/WebSolidColorLayer.cpp:
+ * src/WebViewImpl.h:
+ * tests/Canvas2DLayerBridgeTest.cpp:
+ * tests/GraphicsLayerChromiumTest.cpp:
+ * tests/TextureLayerChromiumTest.cpp:
+
2012-08-10 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (125338 => 125339)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -112,7 +112,6 @@
'public/WebColorName.h',
'public/WebCommonWorkerClient.h',
'public/WebCompositionUnderline.h',
- 'public/WebCompositor.h',
'public/WebCompositorInputHandler.h',
'public/WebCompositorInputHandlerClient.h',
'public/WebConsoleMessage.h',
@@ -300,10 +299,7 @@
'public/platform/WebCanvas.h',
'public/platform/WebColor.h',
'public/platform/WebCommon.h',
- 'public/platform/WebContentLayer.h',
- 'public/platform/WebContentLayerClient.h',
'public/platform/WebData.h',
- 'public/platform/WebExternalTextureLayer.h',
'public/platform/WebFloatPoint.h',
'public/platform/WebFloatQuad.h',
'public/platform/WebFloatRect.h',
@@ -314,9 +310,6 @@
'public/platform/WebHTTPHeaderVisitor.h',
'public/platform/WebHTTPLoadInfo.h',
'public/platform/WebKitPlatformSupport.h',
- 'public/platform/WebLayer.h',
- 'public/platform/WebLayerTreeView.h',
- 'public/platform/WebLayerTreeViewClient.h',
'public/platform/WebNonCopyable.h',
'public/platform/WebPoint.h',
'public/platform/WebPrivateOwnPtr.h',
@@ -328,7 +321,6 @@
'public/platform/WebSocketStreamError.h',
'public/platform/WebSocketStreamHandle.h',
'public/platform/WebSocketStreamHandleClient.h',
- 'public/platform/WebSolidColorLayer.h',
'public/platform/WebString.h',
'public/platform/WebThread.h',
'public/platform/WebThreadSafeData.h',
Deleted: trunk/Source/WebKit/chromium/public/WebCompositor.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/WebCompositor.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/WebCompositor.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,28 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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.
- */
-
-// FIXME: This is a temporary forwarding header, remove once chromium-side code
-// stops using this include path.
-#include "../../../Platform/chromium/public/WebCompositor.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebContentLayer.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebContentLayer.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebContentLayer.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebContentLayer.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebContentLayerClient.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebContentLayerClient.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebContentLayerClient.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebContentLayerClient.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebExternalTextureLayer.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebExternalTextureLayer.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebExternalTextureLayer.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebExternalTextureLayer.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebLayer.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebLayer.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebLayer.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebLayer.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebLayerTreeView.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebLayerTreeView.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebLayerTreeView.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebLayerTreeView.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebLayerTreeViewClient.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebLayerTreeViewClient.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebLayerTreeViewClient.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebLayerTreeViewClient.h"
Deleted: trunk/Source/WebKit/chromium/public/platform/WebSolidColorLayer.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/public/platform/WebSolidColorLayer.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/public/platform/WebSolidColorLayer.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -1,26 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "../../../../Platform/chromium/public/WebSolidColorLayer.h"
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -27,11 +27,11 @@
#define WebCompositorInputHandlerImpl_h
#include "WebActiveWheelFlingParameters.h"
-#include "WebCompositor.h"
#include "WebCompositorInputHandler.h"
#include "WebInputEvent.h"
#include "cc/CCGestureCurve.h"
#include "cc/CCInputHandler.h"
+#include <public/WebCompositor.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -26,12 +26,9 @@
#include "config.h"
#include "WebContentLayerImpl.h"
-#include "platform/WebContentLayerClient.h"
-#include "platform/WebFloatRect.h"
-#include "platform/WebRect.h"
-#include "GraphicsContext.h"
-#include "platform/WebCanvas.h"
-#include "PlatformContextSkia.h"
+#include <public/WebContentLayerClient.h>
+#include <public/WebFloatRect.h>
+#include <public/WebRect.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebLayer.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -24,12 +24,10 @@
*/
#include "config.h"
-#include "platform/WebLayer.h"
+#include <public/WebLayer.h>
-#include "Color.h"
#include "LayerChromium.h"
#include "SkMatrix44.h"
-#include "TransformationMatrix.h"
#include "WebLayerImpl.h"
#include <public/WebFilterOperations.h>
#include <public/WebFloatPoint.h>
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -24,20 +24,19 @@
*/
#include "config.h"
-#include "platform/WebLayerTreeView.h"
+#include <public/WebLayerTreeView.h>
-#include "GraphicsContext3DPrivate.h"
#include "LayerChromium.h"
#include "WebLayerTreeViewImpl.h"
#include "cc/CCFontAtlas.h"
#include "cc/CCGraphicsContext.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCRenderingStats.h"
-#include "platform/WebLayer.h"
-#include "platform/WebPoint.h"
-#include "platform/WebRect.h"
-#include "platform/WebSize.h"
+#include <public/WebLayer.h>
+#include <public/WebPoint.h>
+#include <public/WebRect.h>
#include <public/WebRenderingStats.h>
+#include <public/WebSize.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -26,16 +26,15 @@
#include "config.h"
#include "WebLayerTreeViewImpl.h"
-#include "GraphicsContext3DPrivate.h"
#include "LayerChromium.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCThreadProxy.h"
-#include "platform/WebGraphicsContext3D.h"
-#include "platform/WebLayer.h"
-#include "platform/WebLayerTreeView.h"
-#include "platform/WebLayerTreeViewClient.h"
-#include "platform/WebSize.h"
-#include "platform/WebThread.h"
+#include <public/WebGraphicsContext3D.h>
+#include <public/WebLayer.h>
+#include <public/WebLayerTreeView.h>
+#include <public/WebLayerTreeViewClient.h>
+#include <public/WebSize.h>
+#include <public/WebThread.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -26,7 +26,7 @@
#ifndef WebLayerTreeViewImpl_h
#define WebLayerTreeViewImpl_h
-#include "platform/WebLayerTreeView.h"
+#include <public/WebLayerTreeView.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebSolidColorLayer.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebSolidColorLayer.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebSolidColorLayer.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -24,10 +24,10 @@
*/
#include "config.h"
-#include "platform/WebSolidColorLayer.h"
+#include <public/WebSolidColorLayer.h>
#include "WebSolidColorLayerImpl.h"
-#include "platform/WebFloatRect.h"
+#include <public/WebFloatRect.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (125338 => 125339)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-11 00:55:17 UTC (rev 125339)
@@ -50,14 +50,14 @@
#include "WebNavigationPolicy.h"
#include "WebView.h"
#include "WebViewBenchmarkSupportImpl.h"
-#include "platform/WebFloatQuad.h"
-#include "platform/WebLayer.h"
-#include "platform/WebLayerTreeView.h"
-#include "platform/WebLayerTreeViewClient.h"
-#include "platform/WebPoint.h"
-#include "platform/WebRect.h"
-#include "platform/WebSize.h"
-#include "platform/WebString.h"
+#include <public/WebFloatQuad.h>
+#include <public/WebLayer.h>
+#include <public/WebLayerTreeView.h>
+#include <public/WebLayerTreeViewClient.h>
+#include <public/WebPoint.h>
+#include <public/WebRect.h>
+#include <public/WebSize.h>
+#include <public/WebString.h>
#include <wtf/OwnPtr.h>
#include <wtf/RefCounted.h>
Modified: trunk/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -31,13 +31,12 @@
#include "GraphicsContext3DPrivate.h"
#include "ImageBuffer.h"
#include "LayerChromium.h"
-#include "WebCompositor.h"
-#include "WebKit.h"
#include "cc/CCGraphicsContext.h"
#include "cc/CCRenderingStats.h"
#include "cc/CCTextureUpdateQueue.h"
-#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebThread.h"
+#include <public/Platform.h>
+#include <public/WebCompositor.h>
+#include <public/WebThread.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -36,11 +36,10 @@
#include "Matrix3DTransformOperation.h"
#include "RotateTransformOperation.h"
#include "TranslateTransformOperation.h"
-#include "WebCompositor.h"
-
#include "cc/CCLayerTreeHost.h"
#include "cc/CCLayerTreeHostImpl.h"
#include "cc/CCSingleThreadProxy.h"
+#include <public/WebCompositor.h>
#include <gtest/gtest.h>
#include <public/WebGraphicsContext3D.h>
Modified: trunk/Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp (125338 => 125339)
--- trunk/Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -27,10 +27,10 @@
#include "TextureLayerChromium.h"
#include "FakeCCLayerTreeHostClient.h"
-#include "WebCompositor.h"
#include "cc/CCLayerTreeHost.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <public/WebCompositor.h>
using namespace WebCore;
using ::testing::Mock;
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (125338 => 125339)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -33,8 +33,8 @@
#include "MockWebKitPlatformSupport.h"
#include "TestShell.h"
-#include "WebCompositor.h"
#include "webkit/support/webkit_support.h"
+#include <public/WebCompositor.h>
#include <v8/include/v8-testing.h>
#include <v8/include/v8.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (125338 => 125339)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-08-11 00:32:19 UTC (rev 125338)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-08-11 00:55:17 UTC (rev 125339)
@@ -36,7 +36,6 @@
#include "LayoutTestController.h"
#include "MockWebPrerenderingSupport.h"
#include "platform/WebArrayBufferView.h"
-#include "WebCompositor.h"
#include "WebDataSource.h"
#include "WebDocument.h"
#include "WebElement.h"
@@ -44,23 +43,23 @@
#include "WebHistoryItem.h"
#include "WebIDBFactory.h"
#include "WebTestingSupport.h"
-#include "platform/WebThread.h"
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
#include "WebPermissions.h"
-#include "platform/WebPoint.h"
#include "WebRuntimeFeatures.h"
#include "WebScriptController.h"
#include "WebSettings.h"
-#include "platform/WebSize.h"
-#include "platform/WebString.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
#include "WebView.h"
#include "WebViewHost.h"
#include "skia/ext/platform_canvas.h"
#include "webkit/support/webkit_support.h"
#include "webkit/support/webkit_support_gfx.h"
+#include <public/Platform.h>
+#include <public/WebCompositor.h>
+#include <public/WebPoint.h>
+#include <public/WebSize.h>
+#include <public/WebString.h>
+#include <public/WebThread.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
#include <algorithm>
#include <cctype>
#include <vector>
@@ -163,7 +162,7 @@
WTF::initializeThreading();
if (m_threadedCompositingEnabled) {
- m_webCompositorThread = adoptPtr(WebKit::webKitPlatformSupport()->createThread("Compositor"));
+ m_webCompositorThread = adoptPtr(WebKit::Platform::current()->createThread("Compositor"));
WebCompositor::initialize(m_webCompositorThread.get());
} else
WebCompositor::initialize(0);
