[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 17:51:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7852beb4d7fe4f6db23d9e4c087877bafb717236
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 18:59:57 2010 +0000
Fix Windows build.
* UIProcess/win/WebView.cpp:
(WebKit::WebView::pageDidEnterAcceleratedCompositing):
(WebKit::WebView::pageDidLeaveAcceleratedCompositing):
(WebKit::WebView::switchToDrawingAreaTypeIfNecessary):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73044 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3a6b63c..77e6a6b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
2010-12-01 Anders Carlsson <andersca at apple.com>
+ Fix Windows build.
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::pageDidEnterAcceleratedCompositing):
+ (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
+ (WebKit::WebView::switchToDrawingAreaTypeIfNecessary):
+
+2010-12-01 Anders Carlsson <andersca at apple.com>
+
Fix build.
* UIProcess/win/WebView.h:
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index f969294..5e43726 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -652,15 +652,15 @@ void WebView::setIsInWindow(bool isInWindow)
void WebView::pageDidEnterAcceleratedCompositing()
{
- switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::LayerBackedDrawingAreaType);
+ switchToDrawingAreaTypeIfNecessary(DrawingAreaInfo::LayerBacked);
}
void WebView::pageDidLeaveAcceleratedCompositing()
{
- switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::ChunkedUpdateDrawingAreaType);
+ switchToDrawingAreaTypeIfNecessary(DrawingAreaInfo::ChunkedUpdate);
}
-void WebView::switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::Type type)
+void WebView::switchToDrawingAreaTypeIfNecessary(DrawingAreaInfo::Type type)
{
DrawingAreaInfo::Type existingDrawingAreaType = m_page->drawingArea() ? m_page->drawingArea()->info().type : DrawingAreaInfo::None;
if (existingDrawingAreaType == type)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list