diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/rendering/RenderView.h | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/rendering/RenderView.h')
| -rw-r--r-- | WebCore/rendering/RenderView.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 55aa3b4..b03312f 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -47,13 +47,15 @@ public: virtual bool requiresLayer() const { return true; } virtual void layout(); - virtual void calcWidth(); - virtual void calcHeight(); - virtual void calcPrefWidths(); + virtual void computeLogicalWidth(); + virtual void computeLogicalHeight(); + virtual void computePreferredLogicalWidths(); // The same as the FrameView's layoutHeight/layoutWidth but with null check guards. int viewHeight() const; int viewWidth() const; + int viewLogicalWidth() const { return style()->isVerticalBlockFlow() ? viewWidth() : viewHeight(); } + int viewLogicalHeight() const { return style()->isVerticalBlockFlow() ? viewHeight() : viewWidth(); } float zoomFactor() const; |