diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-03-30 06:04:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-30 06:04:44 -0700 |
| commit | 4b310804bcb474ada9d769f4e15c5f2c8755874c (patch) | |
| tree | b8b2f5b2f5b5a7b7484251ec9dc607a6f0ff2638 /WebCore/rendering | |
| parent | 92c7f8a9ebf8d3ff4497b68a5b800a361bb5912a (diff) | |
| parent | 2eba8dcfad57fc753029296850e489032f0a5c6e (diff) | |
| download | external_webkit-4b310804bcb474ada9d769f4e15c5f2c8755874c.zip external_webkit-4b310804bcb474ada9d769f4e15c5f2c8755874c.tar.gz external_webkit-4b310804bcb474ada9d769f4e15c5f2c8755874c.tar.bz2 | |
am 2eba8dcf: Merge "Remove ANDROID_FIXED_ELEMENTS" into froyo
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderBox.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp index 91f72ed..92c3d99 100644 --- a/WebCore/rendering/RenderBox.cpp +++ b/WebCore/rendering/RenderBox.cpp @@ -56,10 +56,6 @@ #include "WMLNames.h" #endif -#ifdef ANDROID_FIXED_ELEMENTS -#include "PlatformBridge.h" -#endif - using namespace std; namespace WebCore { @@ -1790,12 +1786,6 @@ void RenderBox::calcVerticalMargins() int RenderBox::containingBlockWidthForPositioned(const RenderBoxModelObject* containingBlock) const { -#ifdef ANDROID_FIXED_ELEMENTS - if (style()->position() == FixedPosition && containingBlock->isRenderView()) { - const RenderView* view = toRenderView(containingBlock); - return PlatformBridge::screenWidth(view->frameView()); - } -#endif if (containingBlock->isBox()) { const RenderBox* containingBlockBox = toRenderBox(containingBlock); return containingBlockBox->width() - containingBlockBox->borderLeft() - containingBlockBox->borderRight() - containingBlockBox->verticalScrollbarWidth(); @@ -1826,12 +1816,6 @@ int RenderBox::containingBlockWidthForPositioned(const RenderBoxModelObject* con int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* containingBlock) const { -#ifdef ANDROID_FIXED_ELEMENTS - if (style()->position() == FixedPosition && containingBlock->isRenderView()) { - const RenderView* view = toRenderView(containingBlock); - return PlatformBridge::screenHeight(view->frameView()); - } -#endif int heightResult = 0; if (containingBlock->isBox()) heightResult = toRenderBox(containingBlock)->height(); |