diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-08 18:50:49 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:42 -0800 |
| commit | 0cbc4f2c016ebe2b600784ac016f35c83b5f5b50 (patch) | |
| tree | 3787567d68331f8cac3c13b9ab67bc81740a0657 /WebCore/rendering/RenderView.h | |
| parent | 454b60990e7456af58a206f820de646101747595 (diff) | |
| download | external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.zip external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.tar.gz external_webkit-0cbc4f2c016ebe2b600784ac016f35c83b5f5b50.tar.bz2 | |
Merge Webkit at r73109: render frame docWidth/docHeight method changed.
Change-Id: I492d321eea76f2d2c5278e44ae9c2fe37b5834a6
See:
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063
Diffstat (limited to 'WebCore/rendering/RenderView.h')
| -rw-r--r-- | WebCore/rendering/RenderView.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 99b6a5e..27abf36 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -175,20 +175,14 @@ protected: private: bool shouldRepaint(const IntRect& r) const; -<<<<<<< HEAD #ifdef ANDROID_FLATTEN_FRAMESET public: // used by layout function #endif - int docHeight() const; - int docWidth() const; -======= - int docTop() const; int docHeight(int topOverflow) const; int docLeft() const; int docWidth(int leftOverflow) const; ->>>>>>> webkit.org at r73109 // These functions may only be accessed by LayoutStateMaintainer. bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |