diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
| commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
| tree | ee905fa007e14522848f571215c1054734db9269 /WebCore/page/Settings.h | |
| parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
| download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 | |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/page/Settings.h')
| -rw-r--r-- | WebCore/page/Settings.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index 4a761e8..5b42e89 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -347,6 +347,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; } @@ -517,6 +532,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; |