diff options
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) |