diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKitTools/DumpRenderTree/chromium/WebPreferences.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKitTools/DumpRenderTree/chromium/WebPreferences.h')
| -rw-r--r-- | WebKitTools/DumpRenderTree/chromium/WebPreferences.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h index c0ea70f..46877c0 100644 --- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h +++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h @@ -31,9 +31,9 @@ #ifndef WebPreferences_h #define WebPerferences_h -#include "public/WebSettings.h" -#include "public/WebString.h" -#include "public/WebURL.h" +#include "WebSettings.h" +#include "WebString.h" +#include "WebURL.h" namespace WebKit { class WebView; @@ -77,6 +77,7 @@ struct WebPreferences { bool tabsToLinks; bool hyperlinkAuditingEnabled; bool caretBrowsingEnabled; + bool acceleratedCompositingEnabled; bool accelerated2dCanvasEnabled; WebPreferences() { reset(); } |