Title: [139633] branches/chromium/1364/Source/WebKit/chromium
- Revision
- 139633
- Author
- wangxian...@chromium.org
- Date
- 2013-01-14 11:24:49 -0800 (Mon, 14 Jan 2013)
Log Message
Merge 139028
> [Chromium] Expose compositedScrollingForFramesEnabled setting in WebKit API
> https://bugs.webkit.org/show_bug.cgi?id=106262
>
> Reviewed by James Robinson.
>
> * public/WebSettings.h:
> * src/WebSettingsImpl.cpp:
> (WebKit::WebSettingsImpl::setCompositedScrollingForFramesEnabled):
> (WebKit):
> * src/WebSettingsImpl.h:
> (WebSettingsImpl):
>
TBR=wangxian...@chromium.org
Review URL: https://codereview.chromium.org/11882024
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h (139632 => 139633)
--- branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h 2013-01-14 19:23:26 UTC (rev 139632)
+++ branches/chromium/1364/Source/WebKit/chromium/public/WebSettings.h 2013-01-14 19:24:49 UTC (rev 139633)
@@ -80,6 +80,7 @@
virtual void setAutoZoomFocusedNodeToLegibleScale(bool) = 0;
virtual void setAuthorAndUserStylesEnabled(bool) = 0;
virtual void setCaretBrowsingEnabled(bool) = 0;
+ virtual void setCompositedScrollingForFramesEnabled(bool) = 0;
virtual void setCookieEnabled(bool) = 0;
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setDNSPrefetchingEnabled(bool) = 0;
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp (139632 => 139633)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-01-14 19:23:26 UTC (rev 139632)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2013-01-14 19:24:49 UTC (rev 139633)
@@ -728,4 +728,9 @@
m_settings->setAllowCustomScrollbarInMainFrame(enabled);
}
+void WebSettingsImpl::setCompositedScrollingForFramesEnabled(bool enabled)
+{
+ m_settings->setCompositedScrollingForFramesEnabled(enabled);
+}
+
} // namespace WebKit
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h (139632 => 139633)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-01-14 19:23:26 UTC (rev 139632)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebSettingsImpl.h 2013-01-14 19:24:49 UTC (rev 139633)
@@ -72,6 +72,7 @@
virtual void setAuthorAndUserStylesEnabled(bool);
virtual void setAutoZoomFocusedNodeToLegibleScale(bool);
virtual void setCaretBrowsingEnabled(bool);
+ virtual void setCompositedScrollingForFramesEnabled(bool);
virtual void setCookieEnabled(bool);
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setDNSPrefetchingEnabled(bool);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
