[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
vangelis at chromium.org
vangelis at chromium.org
Wed Dec 22 17:51:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 27b033fd937472886e1e5faea91185fbc2984773
Author: vangelis at chromium.org <vangelis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 20:04:05 2010 +0000
2010-11-30 Vangelis Kokkevis <vangelis at chromium.org>
Reviewed by Darin Fisher.
Get the value of the accelerated compositing triggers from the Settings
class. This allows setting the triggers via command line flags.
https://bugs.webkit.org/show_bug.cgi?id=50301
* public/WebSettings.h:
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::allowedCompositingTriggers):
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled):
(WebKit::WebSettingsImpl::setAcceleratedCompositingForVideoEnabled):
(WebKit::WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled):
(WebKit::WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled):
(WebKit::WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled):
* src/WebSettingsImpl.h:
2010-11-30 Vangelis Kokkevis <vangelis at chromium.org>
Reviewed by Darin Fisher.
Adds accelerated compositing trigger flags to Settings to allow
ports to set them via command line flags, etc.
https://bugs.webkit.org/show_bug.cgi?id=50301
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::setAcceleratedCompositingFor3DTransformsEnabled):
(WebCore::Settings::setAcceleratedCompositingForVideoEnabled):
(WebCore::Settings::setAcceleratedCompositingForPluginsEnabled):
(WebCore::Settings::setAcceleratedCompositingForCanvasEnabled):
(WebCore::Settings::setAcceleratedCompositingForAnimationEnabled):
* page/Settings.h:
(WebCore::Settings::acceleratedCompositingFor3DTransformsEnabled):
(WebCore::Settings::acceleratedCompositingForVideoEnabled):
(WebCore::Settings::acceleratedCompositingForPluginsEnabled):
(WebCore::Settings::acceleratedCompositingForCanvasEnabled):
(WebCore::Settings::acceleratedCompositingForAnimationEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 898fea1..d08dda6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-11-30 Vangelis Kokkevis <vangelis at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Adds accelerated compositing trigger flags to Settings to allow
+ ports to set them via command line flags, etc.
+ https://bugs.webkit.org/show_bug.cgi?id=50301
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setAcceleratedCompositingFor3DTransformsEnabled):
+ (WebCore::Settings::setAcceleratedCompositingForVideoEnabled):
+ (WebCore::Settings::setAcceleratedCompositingForPluginsEnabled):
+ (WebCore::Settings::setAcceleratedCompositingForCanvasEnabled):
+ (WebCore::Settings::setAcceleratedCompositingForAnimationEnabled):
+ * page/Settings.h:
+ (WebCore::Settings::acceleratedCompositingFor3DTransformsEnabled):
+ (WebCore::Settings::acceleratedCompositingForVideoEnabled):
+ (WebCore::Settings::acceleratedCompositingForPluginsEnabled):
+ (WebCore::Settings::acceleratedCompositingForCanvasEnabled):
+ (WebCore::Settings::acceleratedCompositingForAnimationEnabled):
+
2010-12-01 Darin Adler <darin at apple.com>
Fixed warning seen on buildbot.
@@ -468,6 +490,7 @@
(WebCore::TextFieldInputType::shouldSubmitImplicitly):
* html/TextFieldInputType.h:
+>>>>>>> .r73054
2010-11-30 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 5ee869d..7dc103b 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -147,6 +147,11 @@ Settings::Settings(Page* page)
, m_downloadableBinaryFontsEnabled(true)
, m_xssAuditorEnabled(false)
, m_acceleratedCompositingEnabled(true)
+ , m_acceleratedCompositingFor3DTransformsEnabled(true)
+ , m_acceleratedCompositingForVideoEnabled(true)
+ , m_acceleratedCompositingForPluginsEnabled(true)
+ , m_acceleratedCompositingForCanvasEnabled(true)
+ , m_acceleratedCompositingForAnimationEnabled(true)
, m_showDebugBorders(false)
, m_showRepaintCounter(false)
, m_experimentalNotificationsEnabled(false)
@@ -584,6 +589,31 @@ void Settings::setAcceleratedCompositingEnabled(bool enabled)
setNeedsRecalcStyleInAllFrames(m_page);
}
+void Settings::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
+{
+ m_acceleratedCompositingFor3DTransformsEnabled = enabled;
+}
+
+void Settings::setAcceleratedCompositingForVideoEnabled(bool enabled)
+{
+ m_acceleratedCompositingForVideoEnabled = enabled;
+}
+
+void Settings::setAcceleratedCompositingForPluginsEnabled(bool enabled)
+{
+ m_acceleratedCompositingForPluginsEnabled = enabled;
+}
+
+void Settings::setAcceleratedCompositingForCanvasEnabled(bool enabled)
+{
+ m_acceleratedCompositingForCanvasEnabled = enabled;
+}
+
+void Settings::setAcceleratedCompositingForAnimationEnabled(bool enabled)
+{
+ m_acceleratedCompositingForAnimationEnabled = enabled;
+}
+
void Settings::setShowDebugBorders(bool enabled)
{
if (m_showDebugBorders == enabled)
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index c653add..04b126a 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -279,6 +279,21 @@ namespace WebCore {
void setAcceleratedCompositingEnabled(bool);
bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; }
+ void setAcceleratedCompositingFor3DTransformsEnabled(bool);
+ bool acceleratedCompositingFor3DTransformsEnabled() const { return m_acceleratedCompositingFor3DTransformsEnabled; }
+
+ void setAcceleratedCompositingForVideoEnabled(bool);
+ bool acceleratedCompositingForVideoEnabled() const { return m_acceleratedCompositingForVideoEnabled; }
+
+ void setAcceleratedCompositingForPluginsEnabled(bool);
+ bool acceleratedCompositingForPluginsEnabled() const { return m_acceleratedCompositingForPluginsEnabled; }
+
+ void setAcceleratedCompositingForCanvasEnabled(bool);
+ bool acceleratedCompositingForCanvasEnabled() const { return m_acceleratedCompositingForCanvasEnabled; }
+
+ void setAcceleratedCompositingForAnimationEnabled(bool);
+ bool acceleratedCompositingForAnimationEnabled() const { return m_acceleratedCompositingForAnimationEnabled; }
+
void setShowDebugBorders(bool);
bool showDebugBorders() const { return m_showDebugBorders; }
@@ -406,6 +421,11 @@ namespace WebCore {
bool m_downloadableBinaryFontsEnabled : 1;
bool m_xssAuditorEnabled : 1;
bool m_acceleratedCompositingEnabled : 1;
+ bool m_acceleratedCompositingFor3DTransformsEnabled : 1;
+ bool m_acceleratedCompositingForVideoEnabled : 1;
+ bool m_acceleratedCompositingForPluginsEnabled : 1;
+ bool m_acceleratedCompositingForCanvasEnabled : 1;
+ bool m_acceleratedCompositingForAnimationEnabled : 1;
bool m_showDebugBorders : 1;
bool m_showRepaintCounter : 1;
bool m_experimentalNotificationsEnabled : 1;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ca42432..c908480 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-30 Vangelis Kokkevis <vangelis at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Get the value of the accelerated compositing triggers from the Settings
+ class. This allows setting the triggers via command line flags.
+ https://bugs.webkit.org/show_bug.cgi?id=50301
+
+ * public/WebSettings.h:
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::allowedCompositingTriggers):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled):
+ (WebKit::WebSettingsImpl::setAcceleratedCompositingForVideoEnabled):
+ (WebKit::WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled):
+ (WebKit::WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled):
+ (WebKit::WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled):
+ * src/WebSettingsImpl.h:
+
2010-12-01 Tony Chang <tony at chromium.org>
Unreviewed, rolling chromium deps to r67811.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index fa21551..0467c96 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -93,6 +93,11 @@ public:
virtual void setShowDebugBorders(bool) = 0;
virtual void setEditingBehavior(EditingBehavior) = 0;
virtual void setAcceleratedCompositingEnabled(bool) = 0;
+ virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0;
+ virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0;
+ virtual void setAcceleratedCompositingForCanvasEnabled(bool) = 0;
+ virtual void setAcceleratedCompositingForPluginsEnabled(bool) = 0;
+ virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0;
virtual void setAccelerated2dCanvasEnabled(bool) = 0;
virtual void setMemoryInfoEnabled(bool) = 0;
virtual void setHyperlinkAuditingEnabled(bool) = 0;
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 169a02b..7b67ede 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -61,6 +61,7 @@
#include "ScriptController.h"
#include "SearchPopupMenuChromium.h"
#include "SecurityOrigin.h"
+#include "Settings.h"
#if USE(V8)
#include "V8Proxy.h"
#endif
@@ -812,7 +813,20 @@ ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTrigge
if (!m_webView->allowsAcceleratedCompositing())
return 0;
- return ChromeClient::AllTriggers;
+ CompositingTriggerFlags flags = 0;
+ Settings* settings = m_webView->page()->settings();
+ if (settings->acceleratedCompositingFor3DTransformsEnabled())
+ flags |= ThreeDTransformTrigger;
+ if (settings->acceleratedCompositingForVideoEnabled())
+ flags |= VideoTrigger;
+ if (settings->acceleratedCompositingForPluginsEnabled())
+ flags |= PluginTrigger;
+ if (settings->acceleratedCompositingForAnimationEnabled())
+ flags |= AnimationTrigger;
+ if (settings->acceleratedCompositingForCanvasEnabled())
+ flags |= CanvasTrigger;
+
+ return flags;
}
#endif
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 1bea259..e60562c 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -284,6 +284,31 @@ void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
m_settings->setAcceleratedCompositingEnabled(enabled);
}
+void WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
+{
+ m_settings->setAcceleratedCompositingFor3DTransformsEnabled(enabled);
+}
+
+void WebSettingsImpl::setAcceleratedCompositingForVideoEnabled(bool enabled)
+{
+ m_settings->setAcceleratedCompositingForVideoEnabled(enabled);
+}
+
+void WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled(bool enabled)
+{
+ m_settings->setAcceleratedCompositingForPluginsEnabled(enabled);
+}
+
+void WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled(bool enabled)
+{
+ m_settings->setAcceleratedCompositingForCanvasEnabled(enabled);
+}
+
+void WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled(bool enabled)
+{
+ m_settings->setAcceleratedCompositingForAnimationEnabled(enabled);
+}
+
void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)
{
m_settings->setAccelerated2dCanvasEnabled(enabled);
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 081188f..ffdc8d3 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -88,6 +88,11 @@ public:
virtual void setShowDebugBorders(bool);
virtual void setEditingBehavior(EditingBehavior);
virtual void setAcceleratedCompositingEnabled(bool);
+ virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool);
+ virtual void setAcceleratedCompositingForVideoEnabled(bool);
+ virtual void setAcceleratedCompositingForPluginsEnabled(bool);
+ virtual void setAcceleratedCompositingForCanvasEnabled(bool);
+ virtual void setAcceleratedCompositingForAnimationEnabled(bool);
virtual void setAccelerated2dCanvasEnabled(bool);
virtual void setMemoryInfoEnabled(bool);
virtual void setHyperlinkAuditingEnabled(bool);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list