Skip to content
Permalink
Browse files
Drop useless 'clipToContents' argument for windowClipRect()
https://bugs.webkit.org/show_bug.cgi?id=139722

Reviewed by Darin Adler.

Drop useless 'clipToContents' argument for windowClipRect(). This
argument is never used.

No new tests, no behavior change.

* page/FrameView.cpp:
(WebCore::FrameView::windowClipRect):
* page/FrameView.h:
* platform/ScrollView.h:


Canonical link: https://commits.webkit.org/157630@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Dec 17, 2014
1 parent ee62886 commit 669fd9a9e6a2e509ecd9ab9cacf1bf4d21ec53a1
Showing with 22 additions and 8 deletions.
  1. +17 −0 Source/WebCore/ChangeLog
  2. +3 −6 Source/WebCore/page/FrameView.cpp
  3. +1 −1 Source/WebCore/page/FrameView.h
  4. +1 −1 Source/WebCore/platform/ScrollView.h
@@ -1,3 +1,20 @@
2014-12-17 Chris Dumez <cdumez@apple.com>

Drop useless 'clipToContents' argument for windowClipRect()
https://bugs.webkit.org/show_bug.cgi?id=139722

Reviewed by Darin Adler.

Drop useless 'clipToContents' argument for windowClipRect(). This
argument is never used.

No new tests, no behavior change.

* page/FrameView.cpp:
(WebCore::FrameView::windowClipRect):
* page/FrameView.h:
* platform/ScrollView.h:

2014-12-16 Shivakumar JM <shiva.jm@samsung.com>

text node should not be created, On setting document.title to the empty string.
@@ -3208,19 +3208,16 @@ void FrameView::setPagination(const Pagination& pagination)
frame().document()->styleResolverChanged(DeferRecalcStyle);
}

IntRect FrameView::windowClipRect(bool clipToContents) const
IntRect FrameView::windowClipRect() const
{
ASSERT(frame().view() == this);

if (paintsEntireContents())
return contentsToWindow(IntRect(IntPoint(), totalContentsSize()));

// Set our clip rect to be our contents.
IntRect clipRect;
if (clipToContents)
clipRect = contentsToWindow(visibleContentRect(LegacyIOSDocumentVisibleRect));
else
clipRect = contentsToWindow(visibleContentRectIncludingScrollbars(LegacyIOSDocumentVisibleRect));
IntRect clipRect = contentsToWindow(visibleContentRect(LegacyIOSDocumentVisibleRect));

if (!frame().ownerElement())
return clipRect;

@@ -224,7 +224,7 @@ class FrameView final : public ScrollView {
WEBCORE_EXPORT void setViewportSizeForCSSViewportUnits(IntSize);
IntSize viewportSizeForCSSViewportUnits() const;

virtual IntRect windowClipRect(bool clipToContents = true) const override;
virtual IntRect windowClipRect() const override;
WEBCORE_EXPORT IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;

virtual IntRect windowResizerRect() const override;
@@ -85,7 +85,7 @@ class ScrollView : public Widget, public ScrollableArea {
virtual HostWindow* hostWindow() const = 0;

// Returns a clip rect in host window coordinates. Used to clip the blit on a scroll.
virtual IntRect windowClipRect(bool clipToContents = true) const = 0;
virtual IntRect windowClipRect() const = 0;

// Functions for child manipulation and inspection.
const HashSet<RefPtr<Widget>>& children() const { return m_children; }

0 comments on commit 669fd9a

Please sign in to comment.