Bug 102028 – Use correct unscaled document size when calculating scale limits

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[Tien-Ren Chen]

Use correct unscaled document size when calculating scale limits

[Tien-Ren Chen]

Created attachment 173781 [details]
Patch

[Tien-Ren Chen]

Patch uploaded for early feedback. Will add test in next revision.

[Alexandre Elias]

Comment on attachment 173781 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review

Good idea, I should've thought of that before.

> Source/WebCore/page/FrameView.cpp:3811
> +IntSize FrameView::unscaledContentsSize() const

Please move this next to FrameView::setContentsSize().

[Adam Barth]

Comment on attachment 173781 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review

> Source/WebCore/page/FrameView.h:98
>      virtual void setContentsSize(const IntSize&);
> +    IntSize unscaledContentsSize() const;

I'm not sure I understand the relationship between these functions.  Is setContentsSize also unscaled?

[Tien-Ren Chen]

Created attachment 174324 [details]
Patch

[Tien-Ren Chen]

(In reply to comment #4)
> (From update of attachment 173781 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review
> 
> > Source/WebCore/page/FrameView.h:98
> >      virtual void setContentsSize(const IntSize&);
> > +    IntSize unscaledContentsSize() const;
> 
> I'm not sure I understand the relationship between these functions.  Is setContentsSize also unscaled?

Nope, setContentsSize is scaled.

I agree it is super confusing. And it doesn't really fit into current code, where contentsSize() uses push model, that RenderView pushes new contents size to the containing frame, and we use pull model to get latest unscaled contents size from RenderView. My decision is to keep it as a static helper function in WebViewImpl.

[Alexandre Elias]

LGTM, thanks.

[Adam Barth]

Comment on attachment 174324 [details]
Patch

Ok

[WebKit Review Bot]

Comment on attachment 174324 [details]
Patch

Clearing flags on attachment: 174324

Committed r134796: <http://trac.webkit.org/changeset/134796>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.