[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
aroben at apple.com
aroben at apple.com
Mon Feb 21 00:04:41 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 6fc4ff4e6636ff1a4b6fd8ce8dafd7d0c08dc6a4
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 27 23:25:22 2011 +0000
Move CACFLayerTreeHostClient to its own header file
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: http://svn.webkit.org/repository/webkit/trunk@76852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e292e63..daa3d83 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-27 Adam Roben <aroben at 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 at chromium.org>
Reviewed by Tony Chang.
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index 90b41e4..f19c39e 100755
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -25738,27 +25738,27 @@
>
</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
@@ -28899,6 +28899,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\platform\graphics\ca\win\CACFLayerTreeHostClient.h"
+ >
+ </File>
+ <File
RelativePath="..\platform\graphics\ca\win\LayerChangesFlusher.cpp"
>
<FileConfiguration
@@ -43709,14 +43713,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
@@ -43788,17 +43784,9 @@
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
@@ -43821,7 +43809,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_Internal|Win32"
+ Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -43829,7 +43817,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_Cairo|Win32"
+ Name="Debug_Internal|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -43837,7 +43825,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_Cairo|Win32"
+ Name="Debug_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -43845,7 +43833,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_All|Win32"
+ Name="Release_Cairo|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -43854,7 +43842,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\dom\EventQueue.h"
+ RelativePath="..\dom\EventTarget.h"
>
</File>
<File
@@ -65625,6 +65613,10 @@
>
</File>
<File
+ RelativePath="..\inspector\front-end\UglifyJS\parse-js.js"
+ >
+ </File>
+ <File
RelativePath="..\inspector\front-end\Placard.js"
>
</File>
@@ -65637,6 +65629,10 @@
>
</File>
<File
+ RelativePath="..\inspector\front-end\UglifyJS\process.js"
+ >
+ </File>
+ <File
RelativePath="..\inspector\front-end\ProfileDataGridTree.js"
>
</File>
@@ -65836,14 +65832,6 @@
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
diff --git a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
index 166f93c..5e38af7 100644
--- a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
@@ -28,6 +28,7 @@
#if USE(ACCELERATED_COMPOSITING)
+#include "CACFLayerTreeHostClient.h"
#include "LayerChangesFlusher.h"
#include "PlatformCALayer.h"
#include "WebCoreInstanceHandle.h"
diff --git a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h
index 61a6fcc..443482c 100644
--- a/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h
+++ b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h
@@ -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
index 0000000..845f934
--- /dev/null
+++ b/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHostClient.h
@@ -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
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
index c593944..dd3cd32 100644
--- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
+++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
@@ -34,6 +34,11 @@
#include <CoreGraphics/CGColor.h>
#endif
+#if USE(ACCELERATED_COMPOSITING)
+#include "CACFLayerTreeHost.h"
+#include "PlatformCALayer.h"
+#endif
+
namespace WebCore {
MediaPlayerPrivateFullscreenWindow::MediaPlayerPrivateFullscreenWindow(MediaPlayerPrivateFullscreenClient* client)
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
index 7a6d1f5..e07bbac 100644
--- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
+++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
@@ -26,9 +26,10 @@
#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;
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 13a794a..4ff9717 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-27 Adam Roben <aroben at 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 at apple.com>
Windows production build fix.
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
index 4e6c65f..7f98a00 100644
--- a/Source/WebKit/win/WebView.cpp
+++ b/Source/WebKit/win/WebView.cpp
@@ -152,6 +152,11 @@
#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>
diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h
index 1a993c6..ddfb6db 100644
--- a/Source/WebKit/win/WebView.h
+++ b/Source/WebKit/win/WebView.h
@@ -40,8 +40,12 @@
#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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list