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 /WebKit/chromium/src/WebSettingsImpl.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 'WebKit/chromium/src/WebSettingsImpl.h')
| -rw-r--r-- | WebKit/chromium/src/WebSettingsImpl.h | 5 |
1 files changed, 5 insertions, 0 deletions
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); |