diff options
| author | John Reck <jreck@google.com> | 2010-11-04 13:06:22 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:38:05 -0800 |
| commit | 4326279fef480892cd059ad1c738f1320601d33f (patch) | |
| tree | 13de437387ce10eedf27a72222c466562f32dd3e /WebCore/rendering/RenderBox.h | |
| parent | e14391e94c850b8bd03680c23b38978db68687a8 (diff) | |
| download | external_webkit-4326279fef480892cd059ad1c738f1320601d33f.zip external_webkit-4326279fef480892cd059ad1c738f1320601d33f.tar.gz external_webkit-4326279fef480892cd059ad1c738f1320601d33f.tar.bz2 | |
Merge Webkit at r70949: Fix conflicts.
JavaScriptCore/wtf/Platform.h
http://trac.webkit.org/changeset/70726
WebCore/Android.derived.v8bindings.mk
http://trac.webkit.org/changeset/70854
WebCore/Android.jscbindings.mk
http://trac.webkit.org/changeset/70854
WebCore/Android.mk
http://trac.webkit.org/changeset/70854
WebCore/css/CSSStyleSelector.cpp
http://trac.webkit.org/changeset/70250
WebCore/page/Settings.cpp
http://trac.webkit.org/changeset/70714
WebCore/page/Settings.h
http://trac.webkit.org/changeset/70714
WebCore/rendering/RenderBox.h
http://trac.webkit.org/changeset/70482
http://trac.webkit.org/changeset/70664
http://trac.webkit.org/changeset/70917
Change-Id: I0cdaca316df016c3885a23d42ee2038777b7ccff
Diffstat (limited to 'WebCore/rendering/RenderBox.h')
| -rw-r--r-- | WebCore/rendering/RenderBox.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h index bcf95e9..3b261bd 100644 --- a/WebCore/rendering/RenderBox.h +++ b/WebCore/rendering/RenderBox.h @@ -377,16 +377,14 @@ public: virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; virtual int baselinePosition(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; -<<<<<<< HEAD -#ifdef ANDROID_LAYOUT - int getVisibleWidth() const { return m_visibleWidth; } -#endif -======= enum FlippingAdjustment { ChildToParentFlippingAdjustment, ParentToChildFlippingAdjustment }; void adjustForFlippedBlocksWritingMode(RenderBox* child, IntPoint&, FlippingAdjustment); int convertFromFlippedWritingMode(int position); IntSize locationOffsetIncludingFlipping(); ->>>>>>> webkit.org at r70949 + +#ifdef ANDROID_LAYOUT + int getVisibleWidth() const { return m_visibleWidth; } +#endif protected: virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); |