[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
aroben at apple.com
aroben at apple.com
Tue Jan 5 23:57:24 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit fc28ad490db274ef83a0ebfb1248b22b43cc3f85
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 21 14:44:00 2009 +0000
Fix non-ACCELERATED_COMPOSITING builds
* WebPreferences.cpp:
(WebPreferences::acceleratedCompositingEnabled): Guard use of
WKCACFLayerRenderer with USE(ACCELERATED_COMPOSITING).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 72b34f0..c21a57d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-21 Adam Roben <aroben at apple.com>
+
+ Fix non-ACCELERATED_COMPOSITING builds
+
+ * WebPreferences.cpp:
+ (WebPreferences::acceleratedCompositingEnabled): Guard use of
+ WKCACFLayerRenderer with USE(ACCELERATED_COMPOSITING).
+
2009-12-18 Adam Roben <aroben at apple.com>
Add IWebPreferencesPrivate::[set]AcceleratedCompositingEnabled
diff --git a/WebKit/win/WebPreferences.cpp b/WebKit/win/WebPreferences.cpp
index 55320d7..56d01b5 100644
--- a/WebKit/win/WebPreferences.cpp
+++ b/WebKit/win/WebPreferences.cpp
@@ -1365,7 +1365,11 @@ HRESULT WebPreferences::setAcceleratedCompositingEnabled(BOOL enabled)
HRESULT WebPreferences::acceleratedCompositingEnabled(BOOL* enabled)
{
+#if USE(ACCELERATED_COMPOSITING)
*enabled = WKCACFLayerRenderer::acceleratedCompositingAvailable() && boolValueForKey(CFSTR(WebKitAcceleratedCompositingEnabledPreferenceKey));
+#else
+ *enabled = FALSE;
+#endif
return S_OK;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list