<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180607] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180607">180607</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 20:07:06 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use an enum for scrollbar style
https://bugs.webkit.org/show_bug.cgi?id=141985
Reviewed by Beth Dakin.
Source/WebCore:
Switch to an enum class for the scrollbar style (normal or overlay).
* page/ChromeClient.h:
* page/FrameView.cpp:
(WebCore::FrameView::scrollbarStyleChanged):
* page/FrameView.h:
* platform/ScrollTypes.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::scrollbarStyleChanged):
* platform/ScrollView.h:
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::scrollbarStyleChanged):
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::updateScrollerStyle):
Source/WebKit2:
Switch to an enum class for the scrollbar style (normal or overlay).
Sadly it still has to be passed as an int across the process boundary.
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::recommendedScrollbarStyleDidChange):
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::scrollbarStyleChanged):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::recommendedScrollbarStyleDidChange):
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollTypesh">trunk/Source/WebCore/platform/ScrollTypes.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/ChangeLog 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-24 Simon Fraser <simon.fraser@apple.com>
+
+ Use an enum for scrollbar style
+ https://bugs.webkit.org/show_bug.cgi?id=141985
+
+ Reviewed by Beth Dakin.
+
+ Switch to an enum class for the scrollbar style (normal or overlay).
+
+ * page/ChromeClient.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollbarStyleChanged):
+ * page/FrameView.h:
+ * platform/ScrollTypes.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::scrollbarStyleChanged):
+ * platform/ScrollView.h:
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::scrollbarStyleChanged):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::updateScrollerStyle):
+
</ins><span class="cx"> 2015-02-24 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r180599.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
</span><span class="cx">
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const IntRect&) { }
</span><del>- virtual void recommendedScrollbarStyleDidChange(int /*newStyle*/) { }
</del><ins>+ virtual void recommendedScrollbarStyleDidChange(ScrollbarStyle) { }
</ins><span class="cx">
</span><span class="cx"> enum DialogType {
</span><span class="cx"> AlertDialog = 0,
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -3486,7 +3486,7 @@
</span><span class="cx"> return frame().loader().state() != FrameStateComplete;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::scrollbarStyleChanged(int newStyle, bool forceUpdate)
</del><ins>+void FrameView::scrollbarStyleChanged(ScrollbarStyle newStyle, bool forceUpdate)
</ins><span class="cx"> {
</span><span class="cx"> if (!frame().isMainFrame())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/page/FrameView.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> void flushAnyPendingPostLayoutTasks();
</span><span class="cx">
</span><span class="cx"> virtual bool shouldSuspendScrollAnimations() const override;
</span><del>- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) override;
</del><ins>+ virtual void scrollbarStyleChanged(ScrollbarStyle, bool forceUpdate) override;
</ins><span class="cx">
</span><span class="cx"> RenderBox* embeddedContentBox() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollTypes.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollTypes.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/platform/ScrollTypes.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -154,6 +154,11 @@
</span><span class="cx"> ScrollbarButtonsDoubleEnd,
</span><span class="cx"> ScrollbarButtonsDoubleBoth
</span><span class="cx"> };
</span><ins>+
+ enum class ScrollbarStyle {
+ AlwaysVisible,
+ Overlay
+ };
</ins><span class="cx">
</span><span class="cx"> enum ScrollbarOverlayStyle {
</span><span class="cx"> ScrollbarOverlayStyleDefault,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> return !scrollCornerRect().isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollView::scrollbarStyleChanged(int, bool forceUpdate)
</del><ins>+void ScrollView::scrollbarStyleChanged(ScrollbarStyle, bool forceUpdate)
</ins><span class="cx"> {
</span><span class="cx"> if (!forceUpdate)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/platform/ScrollView.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> virtual int scrollPosition(Scrollbar*) const override;
</span><span class="cx"> WEBCORE_EXPORT virtual void setScrollOffset(const IntPoint&) override;
</span><span class="cx"> virtual bool isScrollCornerVisible() const override;
</span><del>- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) override;
</del><ins>+ virtual void scrollbarStyleChanged(ScrollbarStyle, bool forceUpdate) override;
</ins><span class="cx">
</span><span class="cx"> virtual void notifyPageThatContentAreaWillPaint() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> WEBCORE_EXPORT IntSize totalContentsSize() const;
</span><span class="cx">
</span><span class="cx"> virtual bool shouldSuspendScrollAnimations() const { return true; }
</span><del>- virtual void scrollbarStyleChanged(int /*newStyle*/, bool /*forceUpdate*/) { }
</del><ins>+ virtual void scrollbarStyleChanged(ScrollbarStyle, bool /*forceUpdate*/) { }
</ins><span class="cx"> virtual void setVisibleScrollerThumbRect(const IntRect&) { }
</span><span class="cx">
</span><span class="cx"> // Note that this only returns scrollable areas that can actually be scrolled.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -1342,7 +1342,7 @@
</span><span class="cx">
</span><span class="cx"> // If m_needsScrollerStyleUpdate is true, then the page is restoring from the page cache, and
</span><span class="cx"> // a relayout will happen on its own. Otherwise, we must initiate a re-layout ourselves.
</span><del>- scrollableArea().scrollbarStyleChanged(newStyle, !m_needsScrollerStyleUpdate);
</del><ins>+ scrollableArea().scrollbarStyleChanged(newStyle == NSScrollerStyleOverlay ? ScrollbarStyle::Overlay : ScrollbarStyle::AlwaysVisible, !m_needsScrollerStyleUpdate);
</ins><span class="cx">
</span><span class="cx"> m_needsScrollerStyleUpdate = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-02-24 Simon Fraser <simon.fraser@apple.com>
+
+ Use an enum for scrollbar style
+ https://bugs.webkit.org/show_bug.cgi?id=141985
+
+ Reviewed by Beth Dakin.
+
+ Switch to an enum class for the scrollbar style (normal or overlay).
+
+ Sadly it still has to be passed as an int across the process boundary.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::recommendedScrollbarStyleDidChange):
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::scrollbarStyleChanged):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::recommendedScrollbarStyleDidChange):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-02-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][WK2] ASSERTION FAILED: m_sendPort in IPC::Connection::open()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) = 0;
</span><span class="cx"> virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) = 0;
</span><span class="cx"> virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
</span><del>- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) = 0;
</del><ins>+ virtual void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle) = 0;
</ins><span class="cx"> virtual void removeNavigationGestureSnapshot() = 0;
</span><span class="cx">
</span><span class="cx"> virtual CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -5024,7 +5024,7 @@
</span><span class="cx"> void WebPageProxy::recommendedScrollbarStyleDidChange(int32_t newStyle)
</span><span class="cx"> {
</span><span class="cx"> #if USE(APPKIT)
</span><del>- m_pageClient.recommendedScrollbarStyleDidChange(newStyle);
</del><ins>+ m_pageClient.recommendedScrollbarStyleDidChange(static_cast<WebCore::ScrollbarStyle>(newStyle));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(newStyle);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) override;
</span><span class="cx"> virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) override;
</span><span class="cx">
</span><del>- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) override;
</del><ins>+ virtual void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle) override;
</ins><span class="cx">
</span><span class="cx"> virtual WKView* wkView() const override { return m_wkView; }
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -608,11 +608,11 @@
</span><span class="cx"> CorrectionPanel::recordAutocorrectionResponse(m_wkView, response, replacedString, replacementString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageClientImpl::recommendedScrollbarStyleDidChange(int32_t newStyle)
</del><ins>+void PageClientImpl::recommendedScrollbarStyleDidChange(ScrollbarStyle newStyle)
</ins><span class="cx"> {
</span><span class="cx"> // Now re-create a tracking area with the appropriate options given the new scrollbar style
</span><span class="cx"> NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect;
</span><del>- if (newStyle == NSScrollerStyleLegacy)
</del><ins>+ if (newStyle == ScrollbarStyle::AlwaysVisible)
</ins><span class="cx"> options |= NSTrackingActiveAlways;
</span><span class="cx"> else
</span><span class="cx"> options |= NSTrackingActiveInKeyWindow;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> virtual WebCore::Scrollbar* horizontalScrollbar() const override { return m_horizontalScrollbar.get(); }
</span><span class="cx"> virtual WebCore::Scrollbar* verticalScrollbar() const override { return m_verticalScrollbar.get(); }
</span><span class="cx"> virtual bool shouldSuspendScrollAnimations() const override { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate.
</span><del>- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) override;
</del><ins>+ virtual void scrollbarStyleChanged(WebCore::ScrollbarStyle, bool forceUpdate) override;
</ins><span class="cx"> virtual WebCore::IntRect convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntRect& scrollbarRect) const override;
</span><span class="cx"> virtual WebCore::IntRect convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntRect& parentRect) const override;
</span><span class="cx"> virtual WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntPoint& scrollbarPoint) const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx"> return maximumOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PDFPlugin::scrollbarStyleChanged(int, bool forceUpdate)
</del><ins>+void PDFPlugin::scrollbarStyleChanged(ScrollbarStyle style, bool forceUpdate)
</ins><span class="cx"> {
</span><span class="cx"> if (!forceUpdate)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -971,9 +971,9 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::NotifyScrollerThumbIsVisibleInRect(scrollerThumb));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::recommendedScrollbarStyleDidChange(int32_t newStyle)
</del><ins>+void WebChromeClient::recommendedScrollbarStyleDidChange(ScrollbarStyle newStyle)
</ins><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(newStyle));
</del><ins>+ m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(static_cast<int32_t>(newStyle)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color WebChromeClient::underlayColor() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (180606 => 180607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-02-25 03:52:40 UTC (rev 180606)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-02-25 04:07:06 UTC (rev 180607)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const override;
</span><span class="cx">
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) override;
</span><del>- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) override;
</del><ins>+ virtual void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle newStyle) override;
</ins><span class="cx">
</span><span class="cx"> virtual WebCore::Color underlayColor() const override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>