From 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 1 Jun 2011 16:59:03 +0100
Subject: Merge WebKit at r80534: Fix conflicts.

Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223

Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978

Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367

HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.

HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.

CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.

MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.

FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.

NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.

PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988

RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.

Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
---
 Source/WebCore/rendering/RenderBox.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'Source/WebCore/rendering')

diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index 4d90284..6e7c0f2 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -2117,7 +2117,6 @@ void RenderBox::computeBlockDirectionMargins(RenderBlock* containingBlock)
 
 int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
 {
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
     // Fixed element's position should be decided by the visible screen size.
     // That is in the doc coordindate.
@@ -2126,19 +2125,13 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje
         return PlatformBridge::screenWidthInDocCoord(view->frameView());
     }
 #endif
-    if (containingBlock->isBox()) {
-        const RenderBox* containingBlockBox = toRenderBox(containingBlock);
-        return containingBlockBox->width() - containingBlockBox->borderLeft() - containingBlockBox->borderRight() - containingBlockBox->verticalScrollbarWidth();
-    }
-    
-=======
+
     if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode())
         return containingBlockLogicalHeightForPositioned(containingBlock, false);
 
     if (containingBlock->isBox())
         return toRenderBox(containingBlock)->clientLogicalWidth();
 
->>>>>>> WebKit at r80534
     ASSERT(containingBlock->isRenderInline() && containingBlock->isRelPositioned());
 
     const RenderInline* flow = toRenderInline(containingBlock);
@@ -2162,8 +2155,7 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje
     return max(0, (fromRight - fromLeft));
 }
 
-<<<<<<< HEAD
-int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* containingBlock) const
+int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
 {
 #if PLATFORM(ANDROID)
     // Fixed element's position should be decided by the visible screen size.
@@ -2173,14 +2165,10 @@ int RenderBox::containingBlockHeightForPositioned(const RenderBoxModelObject* co
         return PlatformBridge::screenHeightInDocCoord(view->frameView());
     }
 #endif
-    int heightResult = 0;
-=======
-int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const
-{
+
     if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode())
         return containingBlockLogicalWidthForPositioned(containingBlock, false);
 
->>>>>>> WebKit at r80534
     if (containingBlock->isBox())
         return toRenderBox(containingBlock)->clientLogicalHeight();
         
-- 
cgit v1.1