diff options
Diffstat (limited to 'WebCore/rendering/RenderView.h')
| -rw-r--r-- | WebCore/rendering/RenderView.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 27abf36..a139e51 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -176,6 +176,7 @@ protected: private: bool shouldRepaint(const IntRect& r) const; +<<<<<<< HEAD #ifdef ANDROID_FLATTEN_FRAMESET public: // used by layout function #endif @@ -183,6 +184,10 @@ public: // used by layout function int docHeight(int topOverflow) const; int docLeft() const; int docWidth(int leftOverflow) const; +======= + int docHeight() const; + int docWidth() const; +>>>>>>> webkit.org at r72805 // These functions may only be accessed by LayoutStateMaintainer. bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0) |