Diff
Modified: trunk/Source/WebCore/ChangeLog (121377 => 121378)
--- trunk/Source/WebCore/ChangeLog 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/ChangeLog 2012-06-27 22:16:49 UTC (rev 121378)
@@ -1,3 +1,24 @@
+2012-06-27 James Robinson <jam...@chromium.org>
+
+ [chromium] Delete unused includes and forward declarations from compositor code
+ https://bugs.webkit.org/show_bug.cgi?id=90102
+
+ Reviewed by Adrienne Walker.
+
+ * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp:
+ * platform/graphics/chromium/CanvasLayerTextureUpdater.cpp:
+ * platform/graphics/chromium/ContentLayerChromium.h:
+ * platform/graphics/chromium/ImageLayerChromium.cpp:
+ * platform/graphics/chromium/LayerChromium.cpp:
+ * platform/graphics/chromium/LayerChromium.h:
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ * platform/graphics/chromium/ShaderChromium.h:
+ * platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp:
+ * platform/graphics/chromium/TiledLayerChromium.cpp:
+ (WebCore::TiledLayerChromium::updateTiles):
+ * platform/graphics/chromium/cc/CCLayerAnimationController.cpp:
+ * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
+
2012-06-27 Alec Flett <alecfl...@chromium.org>
IndexedDB: make IDBKey immutable
Modified: trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -32,7 +32,6 @@
#include "LayerPainterChromium.h"
#include "PlatformColor.h"
-#include "PlatformContextSkia.h"
#include "skia/ext/platform_canvas.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -30,9 +30,7 @@
#include "CanvasLayerTextureUpdater.h"
-#include "GraphicsContext.h"
#include "LayerPainterChromium.h"
-#include "PlatformContextSkia.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkRect.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-06-27 22:16:49 UTC (rev 121378)
@@ -40,7 +40,6 @@
namespace WebCore {
-class GraphicsContext;
class IntRect;
class LayerTextureUpdater;
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -34,7 +34,6 @@
#include "ImageLayerChromium.h"
-#include "Image.h"
#include "LayerTextureSubImage.h"
#include "LayerTextureUpdater.h"
#include "ManagedTexture.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -33,9 +33,6 @@
#if USE(ACCELERATED_COMPOSITING)
#include "LayerChromium.h"
-#include "NativeImageSkia.h"
-#include "PlatformContextSkia.h"
-#include "RenderLayerBacking.h"
#include "TextStream.h"
#include "cc/CCActiveAnimation.h"
#include "cc/CCAnimationEvents.h"
@@ -44,7 +41,6 @@
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCSettings.h"
-#include "skia/ext/platform_canvas.h"
using namespace std;
using WebKit::WebTransformationMatrix;
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-06-27 22:16:49 UTC (rev 121378)
@@ -34,9 +34,8 @@
#if USE(ACCELERATED_COMPOSITING)
+#include "Color.h"
#include "FloatPoint.h"
-#include "GraphicsContext.h"
-#include "PlatformString.h"
#include "Region.h"
#include "RenderSurfaceChromium.h"
#include "cc/CCLayerAnimationController.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -39,10 +39,8 @@
#include "GeometryBinding.h"
#include "GrTexture.h"
#include "ManagedTexture.h"
-#include "NativeImageSkia.h"
#include "NotImplemented.h"
#include "PlatformColor.h"
-#include "PlatformContextSkia.h"
#include "SharedGraphicsContext3D.h"
#include "SkBitmap.h"
#include "TextureManager.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/ShaderChromium.h (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/ShaderChromium.h 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/ShaderChromium.h 2012-06-27 22:16:49 UTC (rev 121378)
@@ -28,8 +28,8 @@
#if USE(ACCELERATED_COMPOSITING)
-#include "PlatformString.h"
#include "SkColorPriv.h"
+#include <wtf/text/WTFString.h>
namespace WebKit {
class WebGraphicsContext3D;
Modified: trunk/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -30,9 +30,7 @@
#include "SkPictureCanvasLayerTextureUpdater.h"
-#include "GraphicsContext.h"
#include "LayerPainterChromium.h"
-#include "PlatformContextSkia.h"
#include "SkCanvas.h"
#include "TraceEvent.h"
Modified: trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -451,7 +451,7 @@
// Calling prepareToUpdate() calls into WebKit to paint, which may have the side
// effect of disabling compositing, which causes our reference to the texture updater to be deleted.
- // However, we can't free the memory backing the GraphicsContext until the paint finishes,
+ // However, we can't free the memory backing the SkCanvas until the paint finishes,
// so we grab a local reference here to hold the updater alive until the paint completes.
RefPtr<LayerTextureUpdater> protector(textureUpdater());
IntRect paintedOpaqueRect;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.cpp (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.cpp 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.cpp 2012-06-27 22:16:49 UTC (rev 121378)
@@ -26,7 +26,6 @@
#include "cc/CCLayerAnimationController.h"
-#include "GraphicsLayer.h" // for KeyframeValueList
#include "cc/CCActiveAnimation.h"
#include "cc/CCKeyframedAnimationCurve.h"
#include <public/WebTransformationMatrix.h>
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h (121377 => 121378)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-06-27 22:13:53 UTC (rev 121377)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-06-27 22:16:49 UTC (rev 121378)
@@ -33,7 +33,6 @@
namespace WebCore {
-class GraphicsContext;
class ScrollView;
class CCScrollbarLayerImpl : public CCLayerImpl {
