| 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..e7e30e305ded3a72b0b9d589b471951059e5a3df 100644
|
| --- a/Source/WebKit/chromium/public/WebSettings.h
|
| +++ b/Source/WebKit/chromium/public/WebSettings.h
|
| @@ -52,6 +52,17 @@ public:
|
| EditingBehaviorAndroid
|
| };
|
|
|
| + // Enum bit flags for primary pointer device to tell Blink what kind of
|
| + // inputs the user is primarily using.
|
| + // Note: PointerDeviceNone is mutually exclusive with other flags
|
| + // PointerDeviceUnknown is not actually a flag
|
| + enum PointerDevice {
|
| + PointerDeviceUnknown = 0,
|
| + PointerDeviceMouse = 1,
|
| + PointerDeviceTouch = 2,
|
| + PointerDeviceNone = 4
|
| + };
|
| +
|
| virtual bool scrollAnimatorEnabled() const = 0;
|
| virtual bool viewportEnabled() const = 0;
|
| virtual void setAccelerated2dCanvasEnabled(bool) = 0;
|
| @@ -88,7 +99,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 +147,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;
|
|
|