Chromium Code Reviews| Index: Source/WebKit/chromium/public/WebSettings.h |
| diff --git a/Source/WebKit/chromium/public/WebSettings.h b/Source/WebKit/chromium/public/WebSettings.h |
| index d8734a095ebf9be2f70250c7f316fb91b663337b..30c21585cced8a7c108564c6f53e7153cc6eb573 100644 |
| --- a/Source/WebKit/chromium/public/WebSettings.h |
| +++ b/Source/WebKit/chromium/public/WebSettings.h |
| @@ -52,6 +52,13 @@ public: |
| EditingBehaviorAndroid |
| }; |
| + enum PointerDevice { |
| + PointerDeviceUnknown = 0, |
| + PointerDeviceMouse = 1, |
| + PointerDeviceTouch = 2, |
| + PointerDeviceNone = 4 |
|
Rick Byers
2013/04/10 14:57:51
Document that None is mutually exclusive with all
bokan
2013/04/10 16:03:29
Done.
|
| + }; |
| + |
| virtual bool scrollAnimatorEnabled() const = 0; |
| virtual bool viewportEnabled() const = 0; |
| virtual void setAccelerated2dCanvasEnabled(bool) = 0; |
| @@ -88,7 +95,7 @@ public: |
| void setDeferred2dCanvasEnabled(bool) { } // temporary stub |
| virtual void setDeferredImageDecodingEnabled(bool) = 0; |
| virtual void setDeviceSupportsMouse(bool) = 0; |
| - virtual void setDeviceSupportsTouch(bool) = 0; |
| + virtual void setDeviceSupportsTouch(bool) = 0; // FIXME: Remove this http://crbug.com/136119 |
| virtual void setDoubleTapToZoomEnabled(bool) = 0; |
| virtual void setDownloadableBinaryFontsEnabled(bool) = 0; |
| virtual void setEditableLinkBehaviorNeverLive() = 0; |
| @@ -136,6 +143,7 @@ public: |
| virtual void setPerTilePaintingEnabled(bool) = 0; |
| virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0; |
| virtual void setPluginsEnabled(bool) = 0; |
| + virtual void setPrimaryPointerDevices(int) = 0; |
| virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0; |
| virtual void setRenderVSyncNotificationEnabled(bool) = 0; |
| virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0; |