Diff
Modified: trunk/Source/WebCore/ChangeLog (131501 => 131502)
--- trunk/Source/WebCore/ChangeLog 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/ChangeLog 2012-10-16 21:26:01 UTC (rev 131502)
@@ -1,3 +1,28 @@
+2012-10-16 Simon Fraser <simon.fra...@apple.com>
+
+ Some #include hygiene
+ https://bugs.webkit.org/show_bug.cgi?id=99500
+
+ Reviewed by Tony Chang.
+
+ Clean up some #includes, mostly related to GraphicsLayer.h. In many
+ cases this can be replaced by PlatformLayer.h.
+
+ Remove an #include of PluginViewBase.h from Page.h, which was a source
+ of #include fan-out.
+
+ * html/canvas/CanvasRenderingContext2D.h:
+ * page/Page.h:
+ * page/scrolling/ScrollingCoordinator.h:
+ * page/scrolling/ScrollingStateNode.h:
+ * page/scrolling/mac/ScrollingStateNodeMac.mm:
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ * platform/graphics/gpu/DrawingBuffer.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ * plugins/PluginViewBase.h:
+
2012-10-16 Adam Barth <aba...@webkit.org>
Document::adoptNode shouldn't special-case <iframe>
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (131501 => 131502)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -40,7 +40,7 @@
#include <wtf/text/WTFString.h>
#if USE(ACCELERATED_COMPOSITING)
-#include "GraphicsLayer.h"
+#include "PlatformLayer.h"
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/page/Page.h (131501 => 131502)
--- trunk/Source/WebCore/page/Page.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/page/Page.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -29,7 +29,6 @@
#include "PageVisibilityState.h"
#include "Pagination.h"
#include "PlatformScreen.h"
-#include "PluginViewBase.h"
#include "Region.h"
#include "Supplementable.h"
#include "ViewportArguments.h"
@@ -78,6 +77,7 @@
class Node;
class PageGroup;
class PluginData;
+ class PluginViewBase;
class PointerLockController;
class ProgressTracker;
class Range;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (131501 => 131502)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -26,7 +26,6 @@
#ifndef ScrollingCoordinator_h
#define ScrollingCoordinator_h
-#include "GraphicsLayer.h"
#include "IntRect.h"
#include "PlatformWheelEvent.h"
#include "ScrollTypes.h"
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (131501 => 131502)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -28,7 +28,7 @@
#if ENABLE(THREADED_SCROLLING)
-#include "GraphicsLayer.h"
+#include "PlatformLayer.h"
#include "ScrollingCoordinator.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -40,6 +40,7 @@
namespace WebCore {
+class GraphicsLayer;
class ScrollingStateTree;
class ScrollingStateNode {
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm (131501 => 131502)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateNodeMac.mm 2012-10-16 21:26:01 UTC (rev 131502)
@@ -26,6 +26,7 @@
#include "config.h"
#include "ScrollingStateNode.h"
+#include "GraphicsLayer.h"
#include "ScrollingStateTree.h"
#if ENABLE(THREADED_SCROLLING)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (131501 => 131502)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -27,8 +27,8 @@
#define GraphicsContext3D_h
#include "IntRect.h"
-#include "GraphicsLayer.h"
#include "GraphicsTypes3D.h"
+#include "PlatformLayer.h"
#include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
#include <wtf/Noncopyable.h>
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (131501 => 131502)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -44,7 +44,7 @@
#include <wtf/text/StringHash.h>
#if USE(ACCELERATED_COMPOSITING)
-#include "GraphicsLayer.h"
+#include "PlatformLayer.h"
#endif
OBJC_CLASS AVPlayer;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (131501 => 131502)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2012-10-16 21:26:01 UTC (rev 131502)
@@ -33,9 +33,9 @@
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
-#include "GraphicsLayer.h"
#include "KURL.h"
#include "Logging.h"
+#include "PlatformLayer.h"
#include "SoftLinking.h"
#include "TimeRanges.h"
#include <CoreMedia/CoreMedia.h>
Modified: trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h (131501 => 131502)
--- trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -32,9 +32,9 @@
#define DrawingBuffer_h
#include "GraphicsContext3D.h"
-#include "GraphicsLayer.h"
#include "GraphicsTypes3D.h"
#include "IntSize.h"
+#include "PlatformLayer.h"
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (131501 => 131502)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-10-16 21:26:01 UTC (rev 131502)
@@ -47,7 +47,7 @@
#import <wtf/UnusedParam.h>
#if USE(ACCELERATED_COMPOSITING)
-#include "GraphicsLayer.h"
+#include "PlatformLayer.h"
#endif
#if DRAW_FRAME_RATE
Modified: trunk/Source/WebCore/plugins/PluginViewBase.h (131501 => 131502)
--- trunk/Source/WebCore/plugins/PluginViewBase.h 2012-10-16 21:22:18 UTC (rev 131501)
+++ trunk/Source/WebCore/plugins/PluginViewBase.h 2012-10-16 21:26:01 UTC (rev 131502)
@@ -25,9 +25,9 @@
#ifndef PluginWidget_h
#define PluginWidget_h
+#include "PlatformLayer.h"
+#include "ScrollTypes.h"
#include "Widget.h"
-#include "GraphicsLayer.h"
-#include "ScrollTypes.h"
#include <wtf/text/WTFString.h>
namespace JSC {
