Diff
Modified: trunk/Source/WebCore/ChangeLog (185892 => 185893)
--- 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)
@@ -1,3 +1,32 @@
+2015-06-23 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-23 Dean Jackson <[email protected]>
Media controls are missing the white backdrop in UIWebViews
Modified: trunk/Source/WebCore/loader/EmptyClients.h (185892 => 185893)
--- 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)
@@ -125,8 +125,6 @@
virtual KeyboardUIMode keyboardUIMode() override { return KeyboardAccessDefault; }
- virtual IntRect windowResizerRect() const override { return IntRect(); }
-
virtual void invalidateRootView(const IntRect&) override { }
virtual void invalidateContentsAndRootView(const IntRect&) override { }
virtual void invalidateContentsForSlowScroll(const IntRect&) override { }
Modified: trunk/Source/WebCore/page/Chrome.cpp (185892 => 185893)
--- 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)
@@ -347,11 +347,6 @@
m_client.setStatusbarText(frame->displayStringModifiedByEncoding(status));
}
-IntRect Chrome::windowResizerRect() const
-{
- return m_client.windowResizerRect();
-}
-
void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags)
{
if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
Modified: trunk/Source/WebCore/page/Chrome.h (185892 => 185893)
--- 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)
@@ -146,8 +146,6 @@
bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
WEBCORE_EXPORT void setStatusbarText(Frame*, const String&);
- IntRect windowResizerRect() const;
-
void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
void setToolTip(const HitTestResult&);
Modified: trunk/Source/WebCore/page/ChromeClient.h (185892 => 185893)
--- 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)
@@ -148,8 +148,6 @@
virtual void setStatusbarText(const String&) = 0;
virtual KeyboardUIMode keyboardUIMode() = 0;
- virtual IntRect windowResizerRect() const = 0;
-
// Methods used by HostWindow.
virtual bool supportsImmediateInvalidation() { return false; }
virtual void invalidateRootView(const IntRect&) = 0;
Modified: trunk/Source/WebCore/page/FrameView.cpp (185892 => 185893)
--- 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)
@@ -3401,13 +3401,6 @@
invalidateRect(dirtyRect);
}
-IntRect FrameView::windowResizerRect() const
-{
- if (Page* page = frame().page())
- return page->chrome().windowResizerRect();
- return IntRect();
-}
-
float FrameView::visibleContentScaleFactor() const
{
if (!frame().isMainFrame() || !frame().settings().delegatesPageScaling())
Modified: trunk/Source/WebCore/page/FrameView.h (185892 => 185893)
--- 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)
@@ -228,8 +228,6 @@
virtual IntRect windowClipRect() const override;
WEBCORE_EXPORT IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;
- virtual IntRect windowResizerRect() const override;
-
virtual float visibleContentScaleFactor() const override;
#if USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (185892 => 185893)
--- 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)
@@ -45,7 +45,6 @@
, m_verticalScrollbarLock(false)
, m_prohibitsScrolling(false)
, m_canBlitOnScroll(true)
- , m_scrollbarsAvoidingResizer(0)
, m_scrollbarsSuppressed(false)
, m_inUpdateScrollbars(false)
, m_updateScrollbarsPass(0)
@@ -589,14 +588,6 @@
return stretch;
}
-void ScrollView::windowResizerRectChanged()
-{
- if (platformWidget())
- return;
-
- updateScrollbars(scrollOffset());
-}
-
void ScrollView::updateScrollbars(const IntSize& desiredOffset)
{
if (m_inUpdateScrollbars || prohibitsScrolling() || platformWidget() || delegatesScrolling())
@@ -980,41 +971,6 @@
return rootViewToContents(window->screenToRootView(point));
}
-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);
-}
-
void ScrollView::setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress)
{
if (suppressed == m_scrollbarsSuppressed)
Modified: trunk/Source/WebCore/platform/ScrollView.h (185892 => 185893)
--- 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)
@@ -315,16 +315,7 @@
// 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
// we know that we are either not in a window right now or if that window is not visible.
bool isOffscreen() const;
-
- // 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();
- virtual void setParent(ScrollView*) override; // Overridden to update the overlapping scrollbar count.
-
// Called when our frame rect changes (or the rect/scroll position of an ancestor changes).
virtual void frameRectsChanged() override;
@@ -468,8 +459,6 @@
std::unique_ptr<IntSize> m_deferredScrollDelta; // Needed for WebKit scrolling
std::unique_ptr<std::pair<IntPoint, IntPoint>> m_deferredScrollPositions; // Needed for platform widget scrolling
-
- int m_scrollbarsAvoidingResizer;
bool m_scrollbarsSuppressed;
bool m_inUpdateScrollbars;
Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (185892 => 185893)
--- 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)
@@ -77,7 +77,6 @@
, m_documentDragPos(0)
, m_enabled(true)
, m_scrollTimer(*this, &Scrollbar::autoscrollTimerFired)
- , m_overlapsResizer(false)
, m_suppressInvalidation(false)
, m_isAlphaLocked(false)
, m_isCustomScrollbar(isCustomScrollbar)
@@ -428,47 +427,6 @@
return true;
}
-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);
-}
-
void Scrollbar::setEnabled(bool e)
{
if (m_enabled == e)
Modified: trunk/Source/WebCore/platform/Scrollbar.h (185892 => 185893)
--- 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)
@@ -61,7 +61,7 @@
virtual ScrollView* parent() const override { return Widget::parent(); }
virtual ScrollView* root() const override;
- virtual void setFrameRect(const IntRect&) override;
+ virtual void setFrameRect(const IntRect& rect) override { Widget::setFrameRect(rect); }
virtual IntRect frameRect() const override { return Widget::frameRect(); }
virtual void invalidate() override { Widget::invalidate(); }
@@ -140,8 +140,6 @@
ScrollbarTheme* theme() const { return m_theme; }
- virtual void setParent(ScrollView*) override;
-
bool suppressInvalidation() const { return m_suppressInvalidation; }
void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
@@ -197,7 +195,6 @@
bool m_enabled;
Timer m_scrollTimer;
- bool m_overlapsResizer;
bool m_suppressInvalidation;
Modified: trunk/Source/WebKit/mac/ChangeLog (185892 => 185893)
--- 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)
@@ -1,3 +1,14 @@
+2015-06-23 Anders Carlsson <[email protected]>
+
+ 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.
+
2015-06-22 Chris Dumez <[email protected]>
[WK1] WebAllowDenyPolicyListener.denyOnlyThisRequest() should not start a new permission request
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (185892 => 185893)
--- 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)
@@ -90,8 +90,6 @@
virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
- virtual WebCore::IntRect windowResizerRect() const override;
-
virtual bool supportsImmediateInvalidation() override;
virtual void invalidateRootView(const WebCore::IntRect&) override;
virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (185892 => 185893)
--- 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)
@@ -134,12 +134,6 @@
- (void)setIsSelected:(BOOL)isSelected;
@end
-#if !PLATFORM(IOS)
-@interface NSWindow (AppKitSecretsIKnowAbout)
-- (NSRect)_growBoxRect;
-@end
-#endif
-
using namespace WebCore;
using namespace HTMLNames;
@@ -557,15 +551,6 @@
[localPool drain];
}
-IntRect WebChromeClient::windowResizerRect() const
-{
-#if !PLATFORM(IOS)
- return enclosingIntRect([[m_webView window] _growBoxRect]);
-#else
- return IntRect();
-#endif
-}
-
bool WebChromeClient::supportsImmediateInvalidation()
{
return true;
Modified: trunk/Source/WebKit/win/ChangeLog (185892 => 185893)
--- 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)
@@ -1,3 +1,14 @@
+2015-06-23 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-23 Per Arne Vollan <[email protected]>
[WinCairo] WebDownload::initWithRequest is not implemented.
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (185892 => 185893)
--- 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)
@@ -441,11 +441,6 @@
return enabled ? KeyboardAccessTabsToLinks : KeyboardAccessDefault;
}
-IntRect WebChromeClient::windowResizerRect() const
-{
- return IntRect();
-}
-
void WebChromeClient::invalidateRootView(const IntRect& windowRect)
{
ASSERT(core(m_webView->topLevelFrame()));
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (185892 => 185893)
--- 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)
@@ -90,7 +90,6 @@
virtual void setStatusbarText(const WTF::String&);
virtual WebCore::KeyboardUIMode keyboardUIMode();
- virtual WebCore::IntRect windowResizerRect() const;
virtual void invalidateRootView(const WebCore::IntRect&);
virtual void invalidateContentsAndRootView(const WebCore::IntRect&);
Modified: trunk/Source/WebKit2/ChangeLog (185892 => 185893)
--- 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)
@@ -1,3 +1,17 @@
+2015-06-23 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-23 Dan Bernstein <[email protected]>
Restore binary compatibility with iOS 8 Safari after r185877
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185892 => 185893)
--- 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)
@@ -436,11 +436,6 @@
return m_page->keyboardUIMode();
}
-IntRect WebChromeClient::windowResizerRect() const
-{
- return m_page->windowResizerRect();
-}
-
void WebChromeClient::invalidateRootView(const IntRect&)
{
// Do nothing here, there's no concept of invalidating the window in the web process.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (185892 => 185893)
--- 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)
@@ -104,8 +104,6 @@
virtual WebCore::KeyboardUIMode keyboardUIMode() override;
- virtual WebCore::IntRect windowResizerRect() const override;
-
// HostWindow member function overrides.
virtual void invalidateRootView(const WebCore::IntRect&) override;
virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185892 => 185893)
--- 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)
@@ -2493,11 +2493,6 @@
}
#endif
-IntRect WebPage::windowResizerRect() const
-{
- return IntRect();
-}
-
KeyboardUIMode WebPage::keyboardUIMode()
{
bool fullKeyboardAccessEnabled = WebProcess::singleton().fullKeyboardAccessEnabled();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185892 => 185893)
--- 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)
@@ -259,7 +259,6 @@
String userAgent(const WebCore::URL&) const;
String userAgent(WebFrame*, const WebCore::URL&) const;
String platformUserAgent(const WebCore::URL&) const;
- WebCore::IntRect windowResizerRect() const;
WebCore::KeyboardUIMode keyboardUIMode();
WebUndoStep* webUndoStep(uint64_t);
