Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
<rdar://problem/8740920> Gestures: Frame::scalePage() broken by r73885
Reviewed by Beth Dakin.

Make sure the transform applied to the RenderView for page scaling is incorporated into the
docTop/Bottom/Left/Right accessors.

* rendering/RenderView.cpp:
(WebCore::RenderView::docTop):
(WebCore::RenderView::docBottom):
(WebCore::RenderView::docLeft):
(WebCore::RenderView::docRight):



Canonical link: https://commits.webkit.org/63936@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@73525 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
David Hyatt committed Dec 8, 2010
1 parent e983bcf commit e63a1f6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
15 changes: 15 additions & 0 deletions WebCore/ChangeLog
@@ -1,3 +1,18 @@
2010-12-08 David Hyatt <hyatt@apple.com>

Reviewed by Beth Dakin.

<rdar://problem/8740920> Gestures: Frame::scalePage() broken by r73885

Make sure the transform applied to the RenderView for page scaling is incorporated into the
docTop/Bottom/Left/Right accessors.

* rendering/RenderView.cpp:
(WebCore::RenderView::docTop):
(WebCore::RenderView::docBottom):
(WebCore::RenderView::docLeft):
(WebCore::RenderView::docRight):

2010-12-08 Ilya Tikhonovsky <loislo@chromium.org>

Reviewed by Yury Semikhatsky.
Expand Down
8 changes: 8 additions & 0 deletions WebCore/rendering/RenderView.cpp
Expand Up @@ -616,27 +616,35 @@ int RenderView::docTop() const
{
IntRect overflowRect(0, topLayoutOverflow(), 0, bottomLayoutOverflow() - topLayoutOverflow());
flipForWritingMode(overflowRect);
if (hasTransform())
overflowRect = layer()->currentTransform().mapRect(overflowRect);
return overflowRect.y();
}

int RenderView::docBottom() const
{
IntRect overflowRect(layoutOverflowRect());
flipForWritingMode(overflowRect);
if (hasTransform())
overflowRect = layer()->currentTransform().mapRect(overflowRect);
return overflowRect.bottom();
}

int RenderView::docLeft() const
{
IntRect overflowRect(layoutOverflowRect());
flipForWritingMode(overflowRect);
if (hasTransform())
overflowRect = layer()->currentTransform().mapRect(overflowRect);
return overflowRect.x();
}

int RenderView::docRight() const
{
IntRect overflowRect(layoutOverflowRect());
flipForWritingMode(overflowRect);
if (hasTransform())
overflowRect = layer()->currentTransform().mapRect(overflowRect);
return overflowRect.right();
}

Expand Down

0 comments on commit e63a1f6

Please sign in to comment.