diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-02-04 11:41:32 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-02-04 11:41:32 -0800 |
| commit | 8b7cce7f189cb149ee3f31faac189d3a6451a2ac (patch) | |
| tree | 7bacdd2c26ec6515232d72beab2c6d71798e6d2b /WebCore/rendering | |
| parent | e14e4cb809c2afcf51cce7775514d5e7820824f0 (diff) | |
| download | external_webkit-8b7cce7f189cb149ee3f31faac189d3a6451a2ac.zip external_webkit-8b7cce7f189cb149ee3f31faac189d3a6451a2ac.tar.gz external_webkit-8b7cce7f189cb149ee3f31faac189d3a6451a2ac.tar.bz2 | |
Add brackets which are missing
bug: 3407198
Change-Id: I9902f4adf18ea181eaff284444313f47883ed7be
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderBox.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp index fe78fd5..3c8e2ca 100644 --- a/WebCore/rendering/RenderBox.cpp +++ b/WebCore/rendering/RenderBox.cpp @@ -39,7 +39,9 @@ #include "FloatQuad.h" #include "Frame.h" #include "Page.h" +#if PLATFORM(ANDROID) #include "PlatformBridge.h" +#endif #include "RenderArena.h" #include "RenderFlexibleBox.h" #include "RenderInline.h" @@ -2078,13 +2080,14 @@ void RenderBox::computeBlockDirectionMargins(RenderBlock* containingBlock) int RenderBox::containingBlockWidthForPositioned(const RenderBoxModelObject* containingBlock) const { +#if PLATFORM(ANDROID) // Fixed element's position should be decided by the visible screen size. // That is in the doc coordindate. if (style()->position() == FixedPosition && containingBlock->isRenderView()) { const RenderView* view = toRenderView(containingBlock); return PlatformBridge::visibleScreenWidth(view->frameView()); } - +#endif if (containingBlock->isBox()) { const RenderBox* containingBlockBox = toRenderBox(containingBlock); return containingBlockBox->width() - containingBlockBox->borderLeft() - containingBlockBox->borderRight() - containingBlockBox->verticalScrollbarWidth(); @@ -2114,14 +2117,15 @@ int RenderBox::containingBlockWidthForPositioned(const RenderBoxModelObject* con } int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* containingBlock) const -{ +{ +#if PLATFORM(ANDROID) // Fixed element's position should be decided by the visible screen size. // That is in the doc coordindate. if (style()->position() == FixedPosition && containingBlock->isRenderView()) { const RenderView* view = toRenderView(containingBlock); return PlatformBridge::visibleScreenHeight(view->frameView()); } - +#endif int heightResult = 0; if (containingBlock->isBox()) heightResult = toRenderBox(containingBlock)->height(); |