Title: [127076] trunk/Source/WebKit/chromium
- Revision
- 127076
- Author
- [email protected]
- Date
- 2012-08-29 18:23:52 -0700 (Wed, 29 Aug 2012)
Log Message
[chromium] Add WebSettings support for flag to enable/disable gesture tap highlights.
https://bugs.webkit.org/show_bug.cgi?id=95119
Reviewed by Adam Barth.
Add support to WebSettings for flag to enable/disable gesture tap highlights. Relies on existing tests.
* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::WebSettingsImpl):
(WebKit::WebSettingsImpl::setGestureTapHighlightEnabled):
(WebKit):
* src/WebSettingsImpl.h:
(WebSettingsImpl):
(WebKit::WebSettingsImpl::gestureTapHighlightEnabled):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleGestureEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (127075 => 127076)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-30 01:16:48 UTC (rev 127075)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-30 01:23:52 UTC (rev 127076)
@@ -1,3 +1,23 @@
+2012-08-29 W. James MacLean <[email protected]>
+
+ [chromium] Add WebSettings support for flag to enable/disable gesture tap highlights.
+ https://bugs.webkit.org/show_bug.cgi?id=95119
+
+ Reviewed by Adam Barth.
+
+ Add support to WebSettings for flag to enable/disable gesture tap highlights. Relies on existing tests.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::WebSettingsImpl):
+ (WebKit::WebSettingsImpl::setGestureTapHighlightEnabled):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ (WebKit::WebSettingsImpl::gestureTapHighlightEnabled):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::handleGestureEvent):
+
2012-08-29 Dana Jansens <[email protected]>
[chromium] Remove HUD layer when rootLayer is set to null
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (127075 => 127076)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-08-30 01:16:48 UTC (rev 127075)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-08-30 01:23:52 UTC (rev 127076)
@@ -103,6 +103,7 @@
virtual void setForceCompositingMode(bool) = 0;
virtual void setFrameFlatteningEnabled(bool) = 0;
virtual void setFullScreenEnabled(bool) = 0;
+ virtual void setGestureTapHighlightEnabled(bool) = 0;
virtual void setHyperlinkAuditingEnabled(bool) = 0;
virtual void setImagesEnabled(bool) = 0;
virtual void setInteractiveFormValidationEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (127075 => 127076)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-08-30 01:16:48 UTC (rev 127075)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-08-30 01:23:52 UTC (rev 127076)
@@ -53,6 +53,7 @@
, m_renderVSyncEnabled(true)
, m_viewportEnabled(false)
, m_applyDefaultDeviceScaleFactorInCompositor(false)
+ , m_gestureTapHighlightEnabled(true)
, m_defaultTileSize(WebSize(256, 256))
, m_maxUntiledLayerSize(WebSize(512, 512))
{
@@ -636,4 +637,9 @@
m_settings->setCookieEnabled(enabled);
}
+void WebSettingsImpl::setGestureTapHighlightEnabled(bool enableHighlight)
+{
+ m_gestureTapHighlightEnabled = enableHighlight;
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (127075 => 127076)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-08-30 01:16:48 UTC (rev 127075)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-08-30 01:23:52 UTC (rev 127076)
@@ -95,6 +95,7 @@
virtual void setForceCompositingMode(bool);
virtual void setFrameFlatteningEnabled(bool);
virtual void setFullScreenEnabled(bool);
+ virtual void setGestureTapHighlightEnabled(bool);
virtual void setHyperlinkAuditingEnabled(bool);
virtual void setImagesEnabled(bool);
virtual void setInteractiveFormValidationEnabled(bool);
@@ -157,6 +158,7 @@
bool showPaintRects() const { return m_showPaintRects; }
bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }
bool applyDefaultDeviceScaleFactorInCompositor() const { return m_applyDefaultDeviceScaleFactorInCompositor; }
+ bool gestureTapHighlightEnabled() { return m_gestureTapHighlightEnabled; }
WebSize defaultTileSize() const { return m_defaultTileSize; }
WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }
@@ -168,6 +170,7 @@
bool m_renderVSyncEnabled;
bool m_viewportEnabled;
bool m_applyDefaultDeviceScaleFactorInCompositor;
+ bool m_gestureTapHighlightEnabled;
WebSize m_defaultTileSize;
WebSize m_maxUntiledLayerSize;
};
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (127075 => 127076)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-30 01:16:48 UTC (rev 127075)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-30 01:23:52 UTC (rev 127076)
@@ -742,7 +742,8 @@
m_client->cancelScheduledContentIntents();
// Queue a highlight animation, then hand off to regular handler.
#if OS(LINUX)
- enableTouchHighlight(IntPoint(event.x, event.y));
+ if (settingsImpl()->gestureTapHighlightEnabled())
+ enableTouchHighlight(IntPoint(event.x, event.y));
#endif
PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
return mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
