Move CACFLayerTreeHostClient to its own header file
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 23:25:22 +0000 (23:25 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 23:25:22 +0000 (23:25 +0000)
Rubber-stamped by Steve Falkenburg.

Source/WebCore:

* WebCore.vcproj/WebCore.vcproj: Added CACFLayerTreeHostClient.h. Also let VS have its way
with the file.

* platform/graphics/ca/win/CACFLayerTreeHost.cpp: Added new #include.

* platform/graphics/ca/win/CACFLayerTreeHost.h: Removed CACFLayerTreeHostClient.

* platform/graphics/ca/win/CACFLayerTreeHostClient.h: Added.

* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp: Moved some #includes here
from the header file.

* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h: Replaced broader #includes
with more specific ones, plus a forward-declaration.

Source/WebKit/win:

Trim down #includes in WebView.h

* WebView.cpp: Moved some #includes here from the header file.

* WebView.h: Replaced some broader #includes with more specific ones, plus a
forward-declaration.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHostClient.h [new file with mode: 0644]
Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/WebKit/win/WebView.h

index e292e63..daa3d83 100644 (file)
@@ -1,3 +1,24 @@
+2011-01-27  Adam Roben  <aroben@apple.com>
+
+        Move CACFLayerTreeHostClient to its own header file
+
+        Rubber-stamped by Steve Falkenburg.
+
+        * WebCore.vcproj/WebCore.vcproj: Added CACFLayerTreeHostClient.h. Also let VS have its way
+        with the file.
+
+        * platform/graphics/ca/win/CACFLayerTreeHost.cpp: Added new #include.
+
+        * platform/graphics/ca/win/CACFLayerTreeHost.h: Removed CACFLayerTreeHostClient.
+
+        * platform/graphics/ca/win/CACFLayerTreeHostClient.h: Added.
+
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp: Moved some #includes here
+        from the header file.
+
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h: Replaced broader #includes
+        with more specific ones, plus a forward-declaration.
+
 2011-01-27  James Simonsen  <simonjam@chromium.org>
 
         Reviewed by Tony Chang.
index 90b41e4..f19c39e 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollAnimator.cpp"
+                               RelativePath="..\platform\ScrollableArea.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollAnimator.h"
+                               RelativePath="..\platform\ScrollableArea.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollAnimatorWin.cpp"
+                               RelativePath="..\platform\ScrollAnimator.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollAnimatorWin.h"
+                               RelativePath="..\platform\ScrollAnimator.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollableArea.cpp"
+                               RelativePath="..\platform\ScrollAnimatorWin.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\platform\ScrollableArea.h"
+                               RelativePath="..\platform\ScrollAnimatorWin.h"
                                >
                        </File>
                        <File
                                                        </FileConfiguration>
                                                </File>
                                                <File
+                                                       RelativePath="..\platform\graphics\ca\win\CACFLayerTreeHostClient.h"
+                                                       >
+                                               </File>
+                                               <File
                                                        RelativePath="..\platform\graphics\ca\win\LayerChangesFlusher.cpp"
                                                        >
                                                        <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
                                        Name="Debug_Cairo_CFLite|Win32"
                                        ExcludedFromBuild="true"
                                        >
                                                Name="VCCLCompilerTool"
                                        />
                                </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_LTCG|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\dom\EventTarget.h"
+                               RelativePath="..\dom\EventQueue.h"
                                >
                        </File>
                        <File
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug_Internal|Win32"
+                                       Name="Debug_All|Win32"
                                        ExcludedFromBuild="true"
                                        >
                                        <Tool
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug_Cairo|Win32"
+                                       Name="Debug_Internal|Win32"
                                        ExcludedFromBuild="true"
                                        >
                                        <Tool
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release_Cairo|Win32"
+                                       Name="Debug_Cairo|Win32"
                                        ExcludedFromBuild="true"
                                        >
                                        <Tool
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug_All|Win32"
+                                       Name="Release_Cairo|Win32"
                                        ExcludedFromBuild="true"
                                        >
                                        <Tool
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\dom\EventQueue.h"
+                               RelativePath="..\dom\EventTarget.h"
                                >
                        </File>
                        <File
                                        >
                                </File>
                                <File
+                                       RelativePath="..\inspector\front-end\UglifyJS\parse-js.js"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\inspector\front-end\Placard.js"
                                        >
                                </File>
                                        >
                                </File>
                                <File
+                                       RelativePath="..\inspector\front-end\UglifyJS\process.js"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\inspector\front-end\ProfileDataGridTree.js"
                                        >
                                </File>
                                        RelativePath="..\inspector\front-end\WorkersSidebarPane.js"
                                        >
                                </File>
-                                       <File
-                                       RelativePath="..\inspector\front-end\UglifyJS\parse-js.js"
-                                       >
-                               </File>
-                                       <File
-                                       RelativePath="..\inspector\front-end\UglifyJS\process.js"
-                                       >
-                               </File>
                        </Filter>
                </Filter>
                <Filter
index 166f93c..5e38af7 100644 (file)
@@ -28,6 +28,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CACFLayerTreeHostClient.h"
 #include "LayerChangesFlusher.h"
 #include "PlatformCALayer.h"
 #include "WebCoreInstanceHandle.h"
index 61a6fcc..443482c 100644 (file)
@@ -47,14 +47,9 @@ typedef struct CGImage* CGImageRef;
 
 namespace WebCore {
 
+class CACFLayerTreeHostClient;
 class PlatformCALayer;
 
-class CACFLayerTreeHostClient {
-public:
-    virtual ~CACFLayerTreeHostClient() { }
-    virtual void flushPendingGraphicsLayerChanges() { }
-};
-
 // FIXME: Currently there is a CACFLayerTreeHost for each WebView and each
 // has its own CARenderOGLContext and Direct3DDevice9, which is inefficient.
 // (https://bugs.webkit.org/show_bug.cgi?id=31855)
diff --git a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHostClient.h b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHostClient.h
new file mode 100644 (file)
index 0000000..845f934
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Apple 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 INC. ``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 COMPUTER, INC. OR
+ * 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.
+ */
+
+#ifndef CACFLayerTreeHostClient_h
+#define CACFLayerTreeHostClient_h
+
+#if USE(ACCELERATED_COMPOSITING)
+
+namespace WebCore {
+
+class CACFLayerTreeHostClient {
+public:
+    virtual ~CACFLayerTreeHostClient() { }
+    virtual void flushPendingGraphicsLayerChanges() { }
+};
+
+} // namespace WebCore
+
+#endif // USE(ACCELERATED_COMPOSITING)
+
+#endif // CACFLayerTreeHostClient_h
index c593944..dd3cd32 100644 (file)
 #include <CoreGraphics/CGColor.h>
 #endif
 
+#if USE(ACCELERATED_COMPOSITING)
+#include "CACFLayerTreeHost.h"
+#include "PlatformCALayer.h"
+#endif
+
 namespace WebCore {
 
 MediaPlayerPrivateFullscreenWindow::MediaPlayerPrivateFullscreenWindow(MediaPlayerPrivateFullscreenClient* client)
index 7a6d1f5..e07bbac 100644 (file)
 #ifndef MediaPlayerPrivateFullscreenWindow_h
 #define MediaPlayerPrivateFullscreenWindow_h
 
+#include <wtf/RefPtr.h>
+
 #if USE(ACCELERATED_COMPOSITING)
-#include "CACFLayerTreeHost.h"
-#include "PlatformCALayer.h"
+#include "CACFLayerTreeHostClient.h"
 #endif
 
 typedef unsigned WPARAM;
@@ -40,6 +41,11 @@ typedef unsigned int UINT;
 
 namespace WebCore {
 
+#if USE(ACCELERATED_COMPOSITING)
+class CACFLayerTreeHost;
+class PlatformCALayer;
+#endif
+
 class MediaPlayerPrivateFullscreenClient {
 public:
     virtual LRESULT fullscreenClientWndProc(HWND, UINT message, WPARAM, LPARAM) = 0;
index 13a794a..4ff9717 100644 (file)
@@ -1,3 +1,14 @@
+2011-01-27  Adam Roben  <aroben@apple.com>
+
+        Trim down #includes in WebView.h
+
+        Rubber-stamped by Steve Falkenburg.
+
+        * WebView.cpp: Moved some #includes here from the header file.
+
+        * WebView.h: Replaced some broader #includes with more specific ones, plus a
+        forward-declaration.
+
 2011-01-25  Steve Falkenburg  <sfalken@apple.com>
 
         Windows production build fix.
index 4e6c65f..7f98a00 100644 (file)
 #include <WebKitSystemInterface/WebKitSystemInterface.h> 
 #endif
 
+#if USE(ACCELERATED_COMPOSITING)
+#include <WebCore/CACFLayerTreeHost.h>
+#include <WebCore/PlatformCALayer.h>
+#endif
+
 #include <ShlObj.h>
 #include <comutil.h>
 #include <dimm.h>
index 1a993c6..ddfb6db 100644 (file)
 #include <wtf/RefPtr.h>
 
 #if USE(ACCELERATED_COMPOSITING)
-#include <WebCore/CACFLayerTreeHost.h>
-#include <WebCore/PlatformCALayer.h>
+#include <WebCore/CACFLayerTreeHostClient.h>
+#include <WebCore/GraphicsLayerClient.h>
+
+namespace WebCore {
+    class CACFLayerTreeHost;
+}
 #endif
 
 class FullscreenVideoController;