<!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>[184297] 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/184297">184297</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 12:28:21 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need SPI to set the overlay scroll bar style
https://bugs.webkit.org/show_bug.cgi?id=144928
-and corresponding-
rdar://problem/20143614
Reviewed by Anders Carlsson.
Source/WebCore:
New ChromeClient function preferredScrollbarOverlayStyle() will fetch the
scrollbar style that was set via the new SPI.
* page/ChromeClient.h:
If the preferredScrollbarOverlayStyle() is anything but None, then use it. None is
used to indicate that the normal heuristic should compute the appropriate color.
* page/FrameView.cpp:
(WebCore::FrameView::recalculateScrollbarOverlayStyle):
* page/FrameView.h:
Source/WebKit2:
Make scrollbarOverlayStyle a part of the creation parameters.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
New SPI.
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h: Added.
* UIProcess/API/mac/WKView.mm:
(-[WKView _setOverlayScrollbarStyle:]):
(-[WKView _overlayScrollbarStyle]):
Store m_scrollbarOverlayStyle on WebPageProxy, and set it to the WebProcess.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::creationParameters):
(WebKit::WebPageProxy::setOverlayScrollbarStyle):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::overlayScrollbarStyle):
* WebKit2.xcodeproj/project.pbxproj:
Return WebPage’s scrollbarOverlayStyle().
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::preferredScrollbarOverlayStyle):
* WebProcess/WebCoreSupport/WebChromeClient.h:
Cache the scrollbarOverlayStyle() here for the WebProcess.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::setScrollbarOverlayStyle):
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::scrollbarOverlayStyle):
* WebProcess/WebPage/WebPage.messages.in:</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</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>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKOverlayScrollbarStyleh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebCore/ChangeLog 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-13 Beth Dakin <bdakin@apple.com>
+
+ Need SPI to set the overlay scroll bar style
+ https://bugs.webkit.org/show_bug.cgi?id=144928
+ -and corresponding-
+ rdar://problem/20143614
+
+ Reviewed by Anders Carlsson.
+
+ New ChromeClient function preferredScrollbarOverlayStyle() will fetch the
+ scrollbar style that was set via the new SPI.
+ * page/ChromeClient.h:
+
+ If the preferredScrollbarOverlayStyle() is anything but None, then use it. None is
+ used to indicate that the normal heuristic should compute the appropriate color.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::recalculateScrollbarOverlayStyle):
+ * page/FrameView.h:
+
</ins><span class="cx"> 2015-05-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scrollbars in overflow regions are not vanishing after scrolling with scroll snap points
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -385,6 +385,8 @@
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const IntRect&) { }
</span><span class="cx"> virtual void recommendedScrollbarStyleDidChange(ScrollbarStyle) { }
</span><span class="cx">
</span><ins>+ virtual WTF::Optional<ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() { return ScrollbarOverlayStyleDefault; }
+
</ins><span class="cx"> enum DialogType {
</span><span class="cx"> AlertDialog = 0,
</span><span class="cx"> ConfirmDialog = 1,
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -378,8 +378,15 @@
</span><span class="cx"> void FrameView::recalculateScrollbarOverlayStyle()
</span><span class="cx"> {
</span><span class="cx"> ScrollbarOverlayStyle oldOverlayStyle = scrollbarOverlayStyle();
</span><del>- ScrollbarOverlayStyle overlayStyle = ScrollbarOverlayStyleDefault;
</del><ins>+ WTF::Optional<ScrollbarOverlayStyle> clientOverlayStyle = frame().page() ? frame().page()->chrome().client().preferredScrollbarOverlayStyle() : ScrollbarOverlayStyleDefault;
+ if (clientOverlayStyle) {
+ if (clientOverlayStyle.value() != oldOverlayStyle)
+ setScrollbarOverlayStyle(clientOverlayStyle.value());
+ return;
+ }
</ins><span class="cx">
</span><ins>+ ScrollbarOverlayStyle computedOverlayStyle = ScrollbarOverlayStyleDefault;
+
</ins><span class="cx"> Color backgroundColor = documentBackgroundColor();
</span><span class="cx"> if (backgroundColor.isValid()) {
</span><span class="cx"> // Reduce the background color from RGB to a lightness value
</span><span class="lines">@@ -388,11 +395,11 @@
</span><span class="cx"> double hue, saturation, lightness;
</span><span class="cx"> backgroundColor.getHSL(hue, saturation, lightness);
</span><span class="cx"> if (lightness <= .5 && backgroundColor.alpha() > 0)
</span><del>- overlayStyle = ScrollbarOverlayStyleLight;
</del><ins>+ computedOverlayStyle = ScrollbarOverlayStyleLight;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (oldOverlayStyle != overlayStyle)
- setScrollbarOverlayStyle(overlayStyle);
</del><ins>+ if (oldOverlayStyle != computedOverlayStyle)
+ setScrollbarOverlayStyle(computedOverlayStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::clear()
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebCore/page/FrameView.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> void resetScrollbarsAndClearContentsSize();
</span><span class="cx"> void prepareForDetach();
</span><span class="cx"> void detachCustomScrollbars();
</span><del>- void recalculateScrollbarOverlayStyle();
</del><ins>+ WEBCORE_EXPORT void recalculateScrollbarOverlayStyle();
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-05-13 Beth Dakin <bdakin@apple.com>
+
+ Need SPI to set the overlay scroll bar style
+ https://bugs.webkit.org/show_bug.cgi?id=144928
+ -and corresponding-
+ rdar://problem/20143614
+
+ Reviewed by Anders Carlsson.
+
+ Make scrollbarOverlayStyle a part of the creation parameters.
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+
+ New SPI.
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h: Added.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setOverlayScrollbarStyle:]):
+ (-[WKView _overlayScrollbarStyle]):
+
+ Store m_scrollbarOverlayStyle on WebPageProxy, and set it to the WebProcess.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setOverlayScrollbarStyle):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::overlayScrollbarStyle):
+ * WebKit2.xcodeproj/project.pbxproj:
+
+ Return WebPage’s scrollbarOverlayStyle().
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::preferredScrollbarOverlayStyle):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
+ Cache the scrollbarOverlayStyle() here for the WebProcess.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setScrollbarOverlayStyle):
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::scrollbarOverlayStyle):
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-05-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename some StorageManager functions to indicate that they work on local storage entries
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -294,8 +294,9 @@
</span><span class="cx"> template_string = template_string.strip()
</span><span class="cx">
</span><span class="cx"> class_template_types = {
</span><ins>+ 'HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
+ 'Optional': {'headers': ['<wtf/Optional.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</ins><span class="cx"> 'Vector': {'headers': ['<wtf/Vector.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><del>- 'HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</del><span class="cx"> 'std::pair': {'headers': ['<utility>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> encoder << minimumLayoutSize;
</span><span class="cx"> encoder << autoSizingShouldExpandToViewHeight;
</span><span class="cx"> encoder.encodeEnum(scrollPinningBehavior);
</span><ins>+ encoder << scrollbarOverlayStyle;
</ins><span class="cx"> encoder << backgroundExtendsBeyondPage;
</span><span class="cx"> encoder.encodeEnum(layerHostingMode);
</span><span class="cx"> encoder << mimeTypesWithCustomContentProviders;
</span><span class="lines">@@ -152,6 +153,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decodeEnum(parameters.scrollPinningBehavior))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.scrollbarOverlayStyle))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.backgroundExtendsBeyondPage))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decodeEnum(parameters.layerHostingMode))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -106,6 +106,10 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior;
</span><span class="cx">
</span><ins>+ // FIXME: This should be WTF::Optional<WebCore::ScrollbarOverlayStyle>, but we would need to
+ // correctly handle enums inside Optionals when encoding and decoding.
+ WTF::Optional<uint32_t> scrollbarOverlayStyle;
+
</ins><span class="cx"> bool backgroundExtendsBeyondPage;
</span><span class="cx">
</span><span class="cx"> LayerHostingMode layerHostingMode;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #import <WebKit/WKImmediateActionTypes.h>
</span><span class="cx"> #import <WebKit/WKLayoutMode.h>
</span><span class="cx"> #import <WebKit/WKView.h>
</span><ins>+#import <WebKit/_WKOverlayScrollbarStyle.h>
</ins><span class="cx">
</span><span class="cx"> @interface WKView (Private)
</span><span class="cx">
</span><span class="lines">@@ -89,6 +90,8 @@
</span><span class="cx"> @property (nonatomic, setter=_setTopContentInset:) CGFloat _topContentInset;
</span><span class="cx"> @property (nonatomic, setter=_setTotalHeightOfBanners:) CGFloat _totalHeightOfBanners;
</span><span class="cx">
</span><ins>+@property (nonatomic, setter=_setOverlayScrollbarStyle:) _WKOverlayScrollbarStyle _overlayScrollbarStyle;
+
</ins><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) WKLayoutMode _layoutMode;
</span><span class="cx"> // For use with _layoutMode = kWKLayoutModeFixedSize:
</span><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKOverlayScrollbarStyleh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h (0 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKOverlayScrollbarStyle.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+typedef NS_ENUM(NSUInteger, _WKOverlayScrollbarStyle) {
+ _WKOverlayScrollbarStyleDefault,
+ _WKOverlayScrollbarStyleDark,
+ _WKOverlayScrollbarStyleLight,
+
+ // Setting the overlay scrollbar style to automatic will cause WebKit to use its normal
+ // heuristic to choose an appropriate color.
+ _WKOverlayScrollbarStyleAutomatic
+
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -4442,6 +4442,47 @@
</span><span class="cx"> return _data->_totalHeightOfBanners;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setOverlayScrollbarStyle:(_WKOverlayScrollbarStyle)scrollbarStyle
+{
+ WTF::Optional<WebCore::ScrollbarOverlayStyle> coreScrollbarStyle;
+
+ switch (scrollbarStyle) {
+ case _WKOverlayScrollbarStyleDark:
+ coreScrollbarStyle = ScrollbarOverlayStyleDark;
+ break;
+ case _WKOverlayScrollbarStyleLight:
+ coreScrollbarStyle = ScrollbarOverlayStyleLight;
+ break;
+ case _WKOverlayScrollbarStyleDefault:
+ coreScrollbarStyle = ScrollbarOverlayStyleDefault;
+ break;
+ case _WKOverlayScrollbarStyleAutomatic:
+ default:
+ break;
+ }
+
+ _data->_page->setOverlayScrollbarStyle(coreScrollbarStyle);
+}
+
+- (_WKOverlayScrollbarStyle)_overlayScrollbarStyle
+{
+ WTF::Optional<WebCore::ScrollbarOverlayStyle> coreScrollbarStyle = _data->_page->overlayScrollbarStyle();
+
+ if (!coreScrollbarStyle)
+ return _WKOverlayScrollbarStyleAutomatic;
+
+ switch (coreScrollbarStyle.value()) {
+ case ScrollbarOverlayStyleDark:
+ return _WKOverlayScrollbarStyleDark;
+ case ScrollbarOverlayStyleLight:
+ return _WKOverlayScrollbarStyleLight;
+ case ScrollbarOverlayStyleDefault:
+ return _WKOverlayScrollbarStyleDefault;
+ default:
+ return _WKOverlayScrollbarStyleAutomatic;
+ }
+}
+
</ins><span class="cx"> - (NSColor *)_pageExtendedBackgroundColor
</span><span class="cx"> {
</span><span class="cx"> WebCore::Color color = _data->_page->pageExtendedBackgroundColor();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -5000,6 +5000,10 @@
</span><span class="cx"> parameters.minimumLayoutSize = m_minimumLayoutSize;
</span><span class="cx"> parameters.autoSizingShouldExpandToViewHeight = m_autoSizingShouldExpandToViewHeight;
</span><span class="cx"> parameters.scrollPinningBehavior = m_scrollPinningBehavior;
</span><ins>+ if (m_scrollbarOverlayStyle)
+ parameters.scrollbarOverlayStyle = m_scrollbarOverlayStyle.value();
+ else
+ parameters.scrollbarOverlayStyle = Nullopt;
</ins><span class="cx"> parameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
</span><span class="cx"> parameters.layerHostingMode = m_layerHostingMode;
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="lines">@@ -5550,6 +5554,24 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetScrollPinningBehavior(pinning), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarStyle)
+{
+ if (!m_scrollbarOverlayStyle && !scrollbarStyle)
+ return;
+
+ if ((m_scrollbarOverlayStyle && scrollbarStyle) && m_scrollbarOverlayStyle.value() == scrollbarStyle.value())
+ return;
+
+ m_scrollbarOverlayStyle = scrollbarStyle;
+
+ WTF::Optional<uint32_t> scrollbarStyleForMessage;
+ if (scrollbarStyle)
+ scrollbarStyleForMessage = static_cast<ScrollbarOverlayStyle>(scrollbarStyle.value());
+
+ if (isValid())
+ m_process->send(Messages::WebPage::SetScrollbarOverlayStyle(scrollbarStyleForMessage), m_pageID);
+}
+
</ins><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> void WebPageProxy::wrapCryptoKey(const Vector<uint8_t>& key, bool& succeeded, Vector<uint8_t>& wrappedKey)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -972,6 +972,9 @@
</span><span class="cx"> void setScrollPinningBehavior(WebCore::ScrollPinningBehavior);
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
</span><span class="cx">
</span><ins>+ void setOverlayScrollbarStyle(WTF::Optional<WebCore::ScrollbarOverlayStyle>);
+ WTF::Optional<WebCore::ScrollbarOverlayStyle> overlayScrollbarStyle() { return m_scrollbarOverlayStyle; }
+
</ins><span class="cx"> bool shouldRecordNavigationSnapshots() const { return m_shouldRecordNavigationSnapshots; }
</span><span class="cx"> void setShouldRecordNavigationSnapshots(bool shouldRecordSnapshots) { m_shouldRecordNavigationSnapshots = shouldRecordSnapshots; }
</span><span class="cx"> void recordNavigationSnapshot();
</span><span class="lines">@@ -1719,6 +1722,7 @@
</span><span class="cx"> ProcessSuppressionDisabledToken m_preventProcessSuppressionCount;
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior;
</span><ins>+ WTF::Optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</ins><span class="cx">
</span><span class="cx"> uint64_t m_navigationID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -1211,6 +1211,7 @@
</span><span class="cx"> 9321D5861A38EE3C008052BE /* WKImmediateActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D5851A38EE3C008052BE /* WKImmediateActionController.h */; };
</span><span class="cx"> 9321D5881A38EE74008052BE /* WKImmediateActionController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9321D5871A38EE74008052BE /* WKImmediateActionController.mm */; };
</span><span class="cx"> 9321D58A1A38F196008052BE /* WKImmediateActionTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D5891A38F196008052BE /* WKImmediateActionTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 934B724419F5B9BE00AE96D6 /* WKActionMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB951277616D003322B8 /* WKBundleBackForwardList.cpp */; };
</span><span class="lines">@@ -3434,6 +3435,7 @@
</span><span class="cx"> 9321D5851A38EE3C008052BE /* WKImmediateActionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKImmediateActionController.h; sourceTree = "<group>"; };
</span><span class="cx"> 9321D5871A38EE74008052BE /* WKImmediateActionController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKImmediateActionController.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9321D5891A38F196008052BE /* WKImmediateActionTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKImmediateActionTypes.h; sourceTree = "<group>"; };
</span><ins>+ 9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKOverlayScrollbarStyle.h; sourceTree = "<group>"; };
</ins><span class="cx"> 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKActionMenuItemTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 935EEB8F1277615D003322B8 /* InjectedBundleBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleBackForwardList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 935EEB901277615D003322B8 /* InjectedBundleBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleBackForwardList.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5360,6 +5362,7 @@
</span><span class="cx"> 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */,
</span><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */,
</span><span class="cx"> 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */,
</span><ins>+ 9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */,
</ins><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
</span><span class="cx"> 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
</span><span class="cx"> 7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */,
</span><span class="lines">@@ -7879,6 +7882,7 @@
</span><span class="cx"> 7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */,
</span><span class="cx"> 1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */,
</span><span class="cx"> 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */,
</span><ins>+ 9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */,
</ins><span class="cx"> 1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */,
</span><span class="cx"> 1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */,
</span><span class="cx"> 1A0EC906124C0AB8007EF4A5 /* PluginProcessConnection.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -980,6 +980,11 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(static_cast<int32_t>(newStyle)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WTF::Optional<ScrollbarOverlayStyle> WebChromeClient::preferredScrollbarOverlayStyle()
+{
+ return m_page->scrollbarOverlayStyle();
+}
+
</ins><span class="cx"> Color WebChromeClient::underlayColor() const
</span><span class="cx"> {
</span><span class="cx"> return m_page->underlayColor();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -276,6 +276,8 @@
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void recommendedScrollbarStyleDidChange(WebCore::ScrollbarStyle newStyle) override;
</span><span class="cx">
</span><ins>+ virtual WTF::Optional<WebCore::ScrollbarOverlayStyle> preferredScrollbarOverlayStyle() override;
+
</ins><span class="cx"> virtual WebCore::Color underlayColor() const override;
</span><span class="cx">
</span><span class="cx"> virtual void pageExtendedBackgroundColorDidChange(WebCore::Color) const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -450,6 +450,11 @@
</span><span class="cx"> setAutoSizingShouldExpandToViewHeight(parameters.autoSizingShouldExpandToViewHeight);
</span><span class="cx">
</span><span class="cx"> setScrollPinningBehavior(parameters.scrollPinningBehavior);
</span><ins>+ if (parameters.scrollbarOverlayStyle)
+ m_scrollbarOverlayStyle = static_cast<ScrollbarOverlayStyle>(parameters.scrollbarOverlayStyle.value());
+ else
+ m_scrollbarOverlayStyle = WTF::Optional<ScrollbarOverlayStyle>();
+
</ins><span class="cx"> setBackgroundExtendsBeyondPage(parameters.backgroundExtendsBeyondPage);
</span><span class="cx">
</span><span class="cx"> setTopContentInset(parameters.topContentInset);
</span><span class="lines">@@ -4849,6 +4854,15 @@
</span><span class="cx"> m_page->mainFrame().view()->setScrollPinningBehavior(m_scrollPinningBehavior);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setScrollbarOverlayStyle(WTF::Optional<uint32_t> scrollbarStyle)
+{
+ if (scrollbarStyle)
+ m_scrollbarOverlayStyle = static_cast<ScrollbarOverlayStyle>(scrollbarStyle.value());
+ else
+ m_scrollbarOverlayStyle = WTF::Optional<ScrollbarOverlayStyle>();
+ m_page->mainFrame().view()->recalculateScrollbarOverlayStyle();
+}
+
</ins><span class="cx"> PassRefPtr<DocumentLoader> WebPage::createDocumentLoader(Frame& frame, const ResourceRequest& request, const SubstituteData& substituteData)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebDocumentLoader> documentLoader = WebDocumentLoader::create(request, substituteData);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -860,6 +860,9 @@
</span><span class="cx"> WebCore::ScrollPinningBehavior scrollPinningBehavior() { return m_scrollPinningBehavior; }
</span><span class="cx"> void setScrollPinningBehavior(uint32_t /* WebCore::ScrollPinningBehavior */ pinning);
</span><span class="cx">
</span><ins>+ WTF::Optional<WebCore::ScrollbarOverlayStyle> scrollbarOverlayStyle() { return m_scrollbarOverlayStyle; }
+ void setScrollbarOverlayStyle(WTF::Optional<uint32_t /* WebCore::ScrollbarOverlayStyle */> scrollbarStyle);
+
</ins><span class="cx"> PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame&, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</span><span class="cx">
</span><span class="cx"> void getBytecodeProfile(uint64_t callbackID);
</span><span class="lines">@@ -1348,6 +1351,7 @@
</span><span class="cx"> unsigned m_maximumRenderingSuppressionToken;
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior;
</span><ins>+ WTF::Optional<WebCore::ScrollbarOverlayStyle> m_scrollbarOverlayStyle;
</ins><span class="cx">
</span><span class="cx"> bool m_useAsyncScrolling;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (184296 => 184297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-13 19:26:50 UTC (rev 184296)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-13 19:28:21 UTC (rev 184297)
</span><span class="lines">@@ -407,6 +407,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SetScrollPinningBehavior(uint32_t pinning)
</span><ins>+ SetScrollbarOverlayStyle(Optional<uint32_t> scrollbarStyle)
</ins><span class="cx">
</span><span class="cx"> GetBytecodeProfile(uint64_t callbackID)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>