diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-03-30 05:50:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-30 05:50:13 -0700 |
| commit | 2eba8dcfad57fc753029296850e489032f0a5c6e (patch) | |
| tree | 9e63f294bd6813a1d6b60d4a45117c3350717a51 | |
| parent | 0e264b005307cf90741d94b1619940fec20da11a (diff) | |
| parent | 93db38007491957ef1db24320270a8cbc7a83819 (diff) | |
| download | external_webkit-2eba8dcfad57fc753029296850e489032f0a5c6e.zip external_webkit-2eba8dcfad57fc753029296850e489032f0a5c6e.tar.gz external_webkit-2eba8dcfad57fc753029296850e489032f0a5c6e.tar.bz2 | |
Merge "Remove ANDROID_FIXED_ELEMENTS" into froyo
| -rw-r--r-- | WebCore/config.h | 4 | ||||
| -rw-r--r-- | WebCore/rendering/RenderBox.cpp | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 12ada30..9c14b28 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -137,10 +137,6 @@ #define ANDROID_FIX -// Ensure that the fixed elements are set relative to the screen -// rather than the virtual viewport -#define ANDROID_FIXED_ELEMENTS - // Passes the webkit-originated changes of a focused textfield to our UI // thread #define ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS 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(); |