<!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>[185893] 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/185893">185893</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-23 17:43:03 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove windowResizerRect code, nobody is using it anymore
https://bugs.webkit.org/show_bug.cgi?id=146265
Reviewed by Beth Dakin.
Source/WebCore:
* loader/EmptyClients.h:
* page/Chrome.cpp:
(WebCore::Chrome::windowResizerRect): Deleted.
* page/Chrome.h:
* page/ChromeClient.h:
* page/FrameView.cpp:
(WebCore::FrameView::windowResizerRect): Deleted.
* page/FrameView.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::ScrollView): Deleted.
(WebCore::ScrollView::windowResizerRectChanged): Deleted.
(WebCore::ScrollView::containsScrollbarsAvoidingResizer): Deleted.
(WebCore::ScrollView::adjustScrollbarsAvoidingResizerCount): Deleted.
(WebCore::ScrollView::setParent): Deleted.
* platform/ScrollView.h:
(WebCore::ScrollView::windowResizerRect): Deleted.
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::Scrollbar): Deleted.
(WebCore::Scrollbar::setFrameRect): Deleted.
(WebCore::Scrollbar::setParent): Deleted.
* platform/Scrollbar.h:
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::windowResizerRect): Deleted.
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::windowResizerRect): Deleted.
* WebCoreSupport/WebChromeClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::windowResizerRect): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::windowResizerRect): Deleted.
* WebProcess/WebPage/WebPage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeh">trunk/Source/WebCore/page/Chrome.h</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="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarh">trunk/Source/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-06-23 Anders Carlsson <andersca@apple.com>
+
+ Remove windowResizerRect code, nobody is using it anymore
+ https://bugs.webkit.org/show_bug.cgi?id=146265
+
+ Reviewed by Beth Dakin.
+
+ * loader/EmptyClients.h:
+ * page/Chrome.cpp:
+ (WebCore::Chrome::windowResizerRect): Deleted.
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::windowResizerRect): Deleted.
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::ScrollView): Deleted.
+ (WebCore::ScrollView::windowResizerRectChanged): Deleted.
+ (WebCore::ScrollView::containsScrollbarsAvoidingResizer): Deleted.
+ (WebCore::ScrollView::adjustScrollbarsAvoidingResizerCount): Deleted.
+ (WebCore::ScrollView::setParent): Deleted.
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::windowResizerRect): Deleted.
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::Scrollbar): Deleted.
+ (WebCore::Scrollbar::setFrameRect): Deleted.
+ (WebCore::Scrollbar::setParent): Deleted.
+ * platform/Scrollbar.h:
+
</ins><span class="cx"> 2015-06-23 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Media controls are missing the white backdrop in UIWebViews
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -125,8 +125,6 @@
</span><span class="cx">
</span><span class="cx"> virtual KeyboardUIMode keyboardUIMode() override { return KeyboardAccessDefault; }
</span><span class="cx">
</span><del>- virtual IntRect windowResizerRect() const override { return IntRect(); }
-
</del><span class="cx"> virtual void invalidateRootView(const IntRect&) override { }
</span><span class="cx"> virtual void invalidateContentsAndRootView(const IntRect&) override { }
</span><span class="cx"> virtual void invalidateContentsForSlowScroll(const IntRect&) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/page/Chrome.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -347,11 +347,6 @@
</span><span class="cx"> m_client.setStatusbarText(frame->displayStringModifiedByEncoding(status));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect Chrome::windowResizerRect() const
-{
- return m_client.windowResizerRect();
-}
-
</del><span class="cx"> void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx"> if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/page/Chrome.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -146,8 +146,6 @@
</span><span class="cx"> bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
</span><span class="cx"> WEBCORE_EXPORT void setStatusbarText(Frame*, const String&);
</span><span class="cx">
</span><del>- IntRect windowResizerRect() const;
-
</del><span class="cx"> void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><span class="cx">
</span><span class="cx"> void setToolTip(const HitTestResult&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -148,8 +148,6 @@
</span><span class="cx"> virtual void setStatusbarText(const String&) = 0;
</span><span class="cx"> virtual KeyboardUIMode keyboardUIMode() = 0;
</span><span class="cx">
</span><del>- virtual IntRect windowResizerRect() const = 0;
-
</del><span class="cx"> // Methods used by HostWindow.
</span><span class="cx"> virtual bool supportsImmediateInvalidation() { return false; }
</span><span class="cx"> virtual void invalidateRootView(const IntRect&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -3401,13 +3401,6 @@
</span><span class="cx"> invalidateRect(dirtyRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect FrameView::windowResizerRect() const
-{
- if (Page* page = frame().page())
- return page->chrome().windowResizerRect();
- return IntRect();
-}
-
</del><span class="cx"> float FrameView::visibleContentScaleFactor() const
</span><span class="cx"> {
</span><span class="cx"> if (!frame().isMainFrame() || !frame().settings().delegatesPageScaling())
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/page/FrameView.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -228,8 +228,6 @@
</span><span class="cx"> virtual IntRect windowClipRect() const override;
</span><span class="cx"> WEBCORE_EXPORT IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;
</span><span class="cx">
</span><del>- virtual IntRect windowResizerRect() const override;
-
</del><span class="cx"> virtual float visibleContentScaleFactor() const override;
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> , m_verticalScrollbarLock(false)
</span><span class="cx"> , m_prohibitsScrolling(false)
</span><span class="cx"> , m_canBlitOnScroll(true)
</span><del>- , m_scrollbarsAvoidingResizer(0)
</del><span class="cx"> , m_scrollbarsSuppressed(false)
</span><span class="cx"> , m_inUpdateScrollbars(false)
</span><span class="cx"> , m_updateScrollbarsPass(0)
</span><span class="lines">@@ -589,14 +588,6 @@
</span><span class="cx"> return stretch;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollView::windowResizerRectChanged()
-{
- if (platformWidget())
- return;
-
- updateScrollbars(scrollOffset());
-}
-
</del><span class="cx"> void ScrollView::updateScrollbars(const IntSize& desiredOffset)
</span><span class="cx"> {
</span><span class="cx"> if (m_inUpdateScrollbars || prohibitsScrolling() || platformWidget() || delegatesScrolling())
</span><span class="lines">@@ -980,41 +971,6 @@
</span><span class="cx"> return rootViewToContents(window->screenToRootView(point));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScrollView::containsScrollbarsAvoidingResizer() const
-{
- return !m_scrollbarsAvoidingResizer;
-}
-
-void ScrollView::adjustScrollbarsAvoidingResizerCount(int overlapDelta)
-{
- int oldCount = m_scrollbarsAvoidingResizer;
- m_scrollbarsAvoidingResizer += overlapDelta;
- if (parent())
- parent()->adjustScrollbarsAvoidingResizerCount(overlapDelta);
- else if (!scrollbarsSuppressed()) {
- // If we went from n to 0 or from 0 to n and we're the outermost view,
- // we need to invalidate the windowResizerRect(), since it will now need to paint
- // differently.
- if ((oldCount > 0 && m_scrollbarsAvoidingResizer == 0) ||
- (oldCount == 0 && m_scrollbarsAvoidingResizer > 0))
- invalidateRect(windowResizerRect());
- }
-}
-
-void ScrollView::setParent(ScrollView* parentView)
-{
- if (parentView == parent())
- return;
-
- if (m_scrollbarsAvoidingResizer && parent())
- parent()->adjustScrollbarsAvoidingResizerCount(-m_scrollbarsAvoidingResizer);
-
- Widget::setParent(parentView);
-
- if (m_scrollbarsAvoidingResizer && parent())
- parent()->adjustScrollbarsAvoidingResizerCount(m_scrollbarsAvoidingResizer);
-}
-
</del><span class="cx"> void ScrollView::setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress)
</span><span class="cx"> {
</span><span class="cx"> if (suppressed == m_scrollbarsSuppressed)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/platform/ScrollView.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -315,16 +315,7 @@
</span><span class="cx"> // The purpose of this function is to answer whether or not the scroll view is currently visible. Animations and painting updates can be suspended if
</span><span class="cx"> // we know that we are either not in a window right now or if that window is not visible.
</span><span class="cx"> bool isOffscreen() const;
</span><del>-
- // These functions are used to enable scrollbars to avoid window resizer controls that overlap the scroll view. This happens on Mac
- // for example.
- virtual IntRect windowResizerRect() const { return IntRect(); }
- bool containsScrollbarsAvoidingResizer() const;
- void adjustScrollbarsAvoidingResizerCount(int overlapDelta);
- WEBCORE_EXPORT void windowResizerRectChanged();
</del><span class="cx">
</span><del>- virtual void setParent(ScrollView*) override; // Overridden to update the overlapping scrollbar count.
-
</del><span class="cx"> // Called when our frame rect changes (or the rect/scroll position of an ancestor changes).
</span><span class="cx"> virtual void frameRectsChanged() override;
</span><span class="cx">
</span><span class="lines">@@ -468,8 +459,6 @@
</span><span class="cx"> std::unique_ptr<IntSize> m_deferredScrollDelta; // Needed for WebKit scrolling
</span><span class="cx"> std::unique_ptr<std::pair<IntPoint, IntPoint>> m_deferredScrollPositions; // Needed for platform widget scrolling
</span><span class="cx">
</span><del>-
- int m_scrollbarsAvoidingResizer;
</del><span class="cx"> bool m_scrollbarsSuppressed;
</span><span class="cx">
</span><span class="cx"> bool m_inUpdateScrollbars;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> , m_documentDragPos(0)
</span><span class="cx"> , m_enabled(true)
</span><span class="cx"> , m_scrollTimer(*this, &Scrollbar::autoscrollTimerFired)
</span><del>- , m_overlapsResizer(false)
</del><span class="cx"> , m_suppressInvalidation(false)
</span><span class="cx"> , m_isAlphaLocked(false)
</span><span class="cx"> , m_isCustomScrollbar(isCustomScrollbar)
</span><span class="lines">@@ -428,47 +427,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Scrollbar::setFrameRect(const IntRect& rect)
-{
- // Get our window resizer rect and see if we overlap. Adjust to avoid the overlap
- // if necessary.
- IntRect adjustedRect(rect);
- bool overlapsResizer = false;
- ScrollView* view = parent();
- if (view && !rect.isEmpty() && !view->windowResizerRect().isEmpty()) {
- IntRect resizerRect = view->convertFromContainingWindow(view->windowResizerRect());
- if (rect.intersects(resizerRect)) {
- if (orientation() == HorizontalScrollbar) {
- int overlap = rect.maxX() - resizerRect.x();
- if (overlap > 0 && resizerRect.maxX() >= rect.maxX()) {
- adjustedRect.setWidth(rect.width() - overlap);
- overlapsResizer = true;
- }
- } else {
- int overlap = rect.maxY() - resizerRect.y();
- if (overlap > 0 && resizerRect.maxY() >= rect.maxY()) {
- adjustedRect.setHeight(rect.height() - overlap);
- overlapsResizer = true;
- }
- }
- }
- }
- if (overlapsResizer != m_overlapsResizer) {
- m_overlapsResizer = overlapsResizer;
- if (view)
- view->adjustScrollbarsAvoidingResizerCount(m_overlapsResizer ? 1 : -1);
- }
-
- Widget::setFrameRect(adjustedRect);
-}
-
-void Scrollbar::setParent(ScrollView* parentView)
-{
- if (!parentView && m_overlapsResizer && parent())
- parent()->adjustScrollbarsAvoidingResizerCount(-1);
- Widget::setParent(parentView);
-}
-
</del><span class="cx"> void Scrollbar::setEnabled(bool e)
</span><span class="cx"> {
</span><span class="cx"> if (m_enabled == e)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebCore/platform/Scrollbar.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual ScrollView* parent() const override { return Widget::parent(); }
</span><span class="cx"> virtual ScrollView* root() const override;
</span><span class="cx">
</span><del>- virtual void setFrameRect(const IntRect&) override;
</del><ins>+ virtual void setFrameRect(const IntRect& rect) override { Widget::setFrameRect(rect); }
</ins><span class="cx"> virtual IntRect frameRect() const override { return Widget::frameRect(); }
</span><span class="cx">
</span><span class="cx"> virtual void invalidate() override { Widget::invalidate(); }
</span><span class="lines">@@ -140,8 +140,6 @@
</span><span class="cx">
</span><span class="cx"> ScrollbarTheme* theme() const { return m_theme; }
</span><span class="cx">
</span><del>- virtual void setParent(ScrollView*) override;
-
</del><span class="cx"> bool suppressInvalidation() const { return m_suppressInvalidation; }
</span><span class="cx"> void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
</span><span class="cx">
</span><span class="lines">@@ -197,7 +195,6 @@
</span><span class="cx"> bool m_enabled;
</span><span class="cx">
</span><span class="cx"> Timer m_scrollTimer;
</span><del>- bool m_overlapsResizer;
</del><span class="cx">
</span><span class="cx"> bool m_suppressInvalidation;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-23 Anders Carlsson <andersca@apple.com>
+
+ Remove windowResizerRect code, nobody is using it anymore
+ https://bugs.webkit.org/show_bug.cgi?id=146265
+
+ Reviewed by Beth Dakin.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::windowResizerRect): Deleted.
+
</ins><span class="cx"> 2015-06-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK1] WebAllowDenyPolicyListener.denyOnlyThisRequest() should not start a new permission request
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -90,8 +90,6 @@
</span><span class="cx"> virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
</span><span class="cx"> virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
</span><span class="cx">
</span><del>- virtual WebCore::IntRect windowResizerRect() const override;
-
</del><span class="cx"> virtual bool supportsImmediateInvalidation() override;
</span><span class="cx"> virtual void invalidateRootView(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -134,12 +134,6 @@
</span><span class="cx"> - (void)setIsSelected:(BOOL)isSelected;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-@interface NSWindow (AppKitSecretsIKnowAbout)
-- (NSRect)_growBoxRect;
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="lines">@@ -557,15 +551,6 @@
</span><span class="cx"> [localPool drain];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebChromeClient::windowResizerRect() const
-{
-#if !PLATFORM(IOS)
- return enclosingIntRect([[m_webView window] _growBoxRect]);
-#else
- return IntRect();
-#endif
-}
-
</del><span class="cx"> bool WebChromeClient::supportsImmediateInvalidation()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-23 Anders Carlsson <andersca@apple.com>
+
+ Remove windowResizerRect code, nobody is using it anymore
+ https://bugs.webkit.org/show_bug.cgi?id=146265
+
+ Reviewed by Beth Dakin.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::windowResizerRect): Deleted.
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-06-23 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] WebDownload::initWithRequest is not implemented.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -441,11 +441,6 @@
</span><span class="cx"> return enabled ? KeyboardAccessTabsToLinks : KeyboardAccessDefault;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebChromeClient::windowResizerRect() const
-{
- return IntRect();
-}
-
</del><span class="cx"> void WebChromeClient::invalidateRootView(const IntRect& windowRect)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(core(m_webView->topLevelFrame()));
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx"> virtual void setStatusbarText(const WTF::String&);
</span><span class="cx">
</span><span class="cx"> virtual WebCore::KeyboardUIMode keyboardUIMode();
</span><del>- virtual WebCore::IntRect windowResizerRect() const;
</del><span class="cx">
</span><span class="cx"> virtual void invalidateRootView(const WebCore::IntRect&);
</span><span class="cx"> virtual void invalidateContentsAndRootView(const WebCore::IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-23 Anders Carlsson <andersca@apple.com>
+
+ Remove windowResizerRect code, nobody is using it anymore
+ https://bugs.webkit.org/show_bug.cgi?id=146265
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::windowResizerRect): Deleted.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::windowResizerRect): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2015-06-23 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Restore binary compatibility with iOS 8 Safari after r185877
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -436,11 +436,6 @@
</span><span class="cx"> return m_page->keyboardUIMode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebChromeClient::windowResizerRect() const
-{
- return m_page->windowResizerRect();
-}
-
</del><span class="cx"> void WebChromeClient::invalidateRootView(const IntRect&)
</span><span class="cx"> {
</span><span class="cx"> // Do nothing here, there's no concept of invalidating the window in the web process.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -104,8 +104,6 @@
</span><span class="cx">
</span><span class="cx"> virtual WebCore::KeyboardUIMode keyboardUIMode() override;
</span><span class="cx">
</span><del>- virtual WebCore::IntRect windowResizerRect() const override;
-
</del><span class="cx"> // HostWindow member function overrides.
</span><span class="cx"> virtual void invalidateRootView(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -2493,11 +2493,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-IntRect WebPage::windowResizerRect() const
-{
- return IntRect();
-}
-
</del><span class="cx"> KeyboardUIMode WebPage::keyboardUIMode()
</span><span class="cx"> {
</span><span class="cx"> bool fullKeyboardAccessEnabled = WebProcess::singleton().fullKeyboardAccessEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185892 => 185893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-24 00:29:11 UTC (rev 185892)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-24 00:43:03 UTC (rev 185893)
</span><span class="lines">@@ -259,7 +259,6 @@
</span><span class="cx"> String userAgent(const WebCore::URL&) const;
</span><span class="cx"> String userAgent(WebFrame*, const WebCore::URL&) const;
</span><span class="cx"> String platformUserAgent(const WebCore::URL&) const;
</span><del>- WebCore::IntRect windowResizerRect() const;
</del><span class="cx"> WebCore::KeyboardUIMode keyboardUIMode();
</span><span class="cx">
</span><span class="cx"> WebUndoStep* webUndoStep(uint64_t);
</span></span></pre>
</div>
</div>
</body>
</html>