summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/Android.v8bindings.mk5
-rw-r--r--WebCore/bindings/scripts/CodeGeneratorV8.pm9
-rw-r--r--WebCore/css/CSSParser.cpp12
-rw-r--r--WebCore/css/CSSStyleSelector.cpp10
-rw-r--r--WebCore/html/HTMLLinkElement.cpp5
-rw-r--r--WebCore/loader/FrameLoader.cpp8
-rw-r--r--WebCore/platform/android/PlatformBridge.h3
-rw-r--r--WebCore/platform/android/TemporaryLinkStubs.cpp12
-rw-r--r--WebCore/rendering/RenderLayer.cpp4
-rw-r--r--WebCore/rendering/RenderTable.cpp19
-rw-r--r--WebCore/rendering/RenderTableSection.cpp19
11 files changed, 17 insertions, 89 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 30d7487..c42f818 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -54,14 +54,9 @@ LOCAL_SRC_FILES += \
bindings/v8/NPV8Object.cpp \
bindings/v8/ScheduledAction.cpp \
bindings/v8/ScopedDOMDataStore.cpp \
-<<<<<<< HEAD
bindings/v8/ScriptCachedFrameData.cpp \
- bindings/v8/ScriptCallFrame.cpp \
- bindings/v8/ScriptCallStack.cpp \
-=======
bindings/v8/ScriptArray.cpp \
bindings/v8/ScriptCallStackFactory.cpp \
->>>>>>> webkit.org at r71558
bindings/v8/ScriptController.cpp \
bindings/v8/ScriptEventListener.cpp \
bindings/v8/ScriptFunctionCall.cpp \
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 2a76692..078794b 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -272,9 +272,6 @@ sub GenerateHeader
push(@headerContent, "\nnamespace WebCore {\n");
push(@headerContent, "\ntemplate<typename PODType> class V8SVGPODTypeWrapper;\n") if $podType;
push(@headerContent, "\ntemplate<typename PropertyType> class SVGPropertyTearOff;\n") if $svgPropertyType;
-<<<<<<< HEAD
- push(@headerContent, "\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n") if $svgListPropertyType;
-=======
if ($svgListPropertyType) {
if ($svgListPropertyType =~ /SVGStaticListPropertyTearOff/) {
push(@headerContent, "\ntemplate<typename PropertyType> class SVGStaticListPropertyTearOff;\n");
@@ -282,7 +279,6 @@ sub GenerateHeader
push(@headerContent, "\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n");
}
}
->>>>>>> webkit.org at r71558
push(@headerContent, "\nclass FloatRect;\n") if $svgPropertyType && $svgPropertyType eq "FloatRect";
push(@headerContent, "\nclass $className {\n");
@@ -934,10 +930,6 @@ END
} elsif ($codeGenerator->IsSVGTypeNeedingTearOff($attrType) and not $implClassName =~ /List$/) {
$implIncludes{"V8$attrType.h"} = 1;
$implIncludes{"SVGPropertyTearOff.h"} = 1;
-<<<<<<< HEAD
- my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
- push(@implContentDecls, " return toV8(WTF::getPtr(${svgNativeType}::create($result)));\n");
-=======
my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOff($attrType) and not defined $attribute->signature->extendedAttributes->{"Immutable"}) {
$tearOffType =~ s/SVGPropertyTearOff</SVGStaticPropertyTearOff<$implClassName, /;
@@ -956,7 +948,6 @@ END
} else {
push(@implContentDecls, " return toV8(WTF::getPtr(${tearOffType}::create($result)));\n");
}
->>>>>>> webkit.org at r71558
} elsif ($attrIsPodType) {
$implIncludes{"V8${attrType}.h"} = 1;
push(@implContentDecls, " return toV8(wrapper.release().get());\n");
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index f98036f..dcff1ac 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -1840,7 +1840,11 @@ bool CSSParser::parseValue(int propId, bool important)
validPrimitive = true;
break;
-<<<<<<< HEAD
+ case CSSPropertyWebkitTextCombine:
+ if (id == CSSValueNone || id == CSSValueCluster || id == CSSValueUpright)
+ validPrimitive = true;
+ break;
+
#ifdef ANDROID_CSS_RING
case CSSPropertyWebkitRing:
{
@@ -1878,12 +1882,6 @@ bool CSSParser::parseValue(int propId, bool important)
m_valueList->next();
break;
#endif
-=======
- case CSSPropertyWebkitTextCombine:
- if (id == CSSValueNone || id == CSSValueCluster || id == CSSValueUpright)
- validPrimitive = true;
- break;
->>>>>>> webkit.org at r71558
#if ENABLE(SVG)
default:
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index ec56916..750f6e7 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -5616,7 +5616,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
return;
}
-<<<<<<< HEAD
+ case CSSPropertyWebkitTextCombine:
+ HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine)
+ return;
+
#ifdef ANDROID_CSS_RING
case CSSPropertyWebkitRing:
if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return;
@@ -5760,11 +5763,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
return;
}
#endif
-=======
- case CSSPropertyWebkitTextCombine:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine)
- return;
->>>>>>> webkit.org at r71558
#if ENABLE(SVG)
default:
diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp
index 9303076..bc7b99d 100644
--- a/WebCore/html/HTMLLinkElement.cpp
+++ b/WebCore/html/HTMLLinkElement.cpp
@@ -199,7 +199,6 @@ void HTMLLinkElement::process()
if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty())
document()->setIconURL(m_url.string(), type);
-<<<<<<< HEAD
#ifdef ANDROID_APPLE_TOUCH_ICON
if ((m_relAttribute.m_isTouchIcon || m_relAttribute.m_isPrecomposedTouchIcon) && m_url.isValid()
&& !m_url.isEmpty() && document()->frame())
@@ -208,9 +207,6 @@ void HTMLLinkElement::process()
m_relAttribute.m_isPrecomposedTouchIcon);
#endif
- if (m_relAttribute.m_isDNSPrefetch && document()->isDNSPrefetchEnabled() && m_url.isValid() && !m_url.isEmpty())
- ResourceHandle::prepareForURL(m_url);
-=======
if (m_relAttribute.m_isDNSPrefetch) {
Settings* settings = document()->settings();
// FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt
@@ -218,7 +214,6 @@ void HTMLLinkElement::process()
if (settings && settings->dnsPrefetchingEnabled() && m_url.isValid() && !m_url.isEmpty())
ResourceHandle::prepareForURL(m_url);
}
->>>>>>> webkit.org at r71558
#if ENABLE(LINK_PREFETCH)
if (m_relAttribute.m_isLinkPrefetch && m_url.isValid() && document()->frame())
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index e4a6513..8277338 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -37,12 +37,8 @@
#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size
#include "Archive.h"
#include "ArchiveFactory.h"
-<<<<<<< HEAD
#endif
-#include "BackForwardList.h"
-=======
#include "BackForwardController.h"
->>>>>>> webkit.org at r71558
#include "BeforeUnloadEvent.h"
#include "MemoryCache.h"
#include "CachedPage.h"
@@ -952,12 +948,8 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer,
}
}
-<<<<<<< HEAD
#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size
- RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->name());
-=======
RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
->>>>>>> webkit.org at r71558
if (subframeArchive)
childFrame->loader()->loadArchive(subframeArchive.release());
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index 3098d6c..0af0429 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -108,7 +108,6 @@ public:
static bool cookiesEnabled(const Document*);
// Plugin
static NPObject* pluginScriptableObject(Widget*);
-<<<<<<< HEAD
// Popups
static bool popupsAllowed(NPP);
@@ -140,10 +139,8 @@ public:
// Updates the layers on the UI
static void updateLayers(FrameView* view);
-=======
// Language
static String computeDefaultLanguage();
->>>>>>> webkit.org at r71558
};
}
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index b1c0276..bcb5bfc 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -92,18 +92,6 @@ using namespace WebCore;
/* Completely empty stubs (mostly to allow DRT to run): */
/********************************************************/
-<<<<<<< HEAD
-// This function is used by Javascript to find out what the default language
-// the user has selected. It is used by the JS object Navigator.language
-// I guess this information should be mapped with the Accept-Language: HTTP header.
-String WebCore::platformDefaultLanguage()
-{
- verifiedOk();
- return "en";
-}
-
-=======
->>>>>>> webkit.org at r71558
namespace WebCore {
// This function tells the bridge that a resource was loaded from the cache and thus
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 2678207..2f1032f 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -3803,13 +3803,10 @@ bool RenderLayer::shouldBeNormalFlowOnly() const
bool RenderLayer::isSelfPaintingLayer() const
{
-<<<<<<< HEAD
#if ENABLE(ANDROID_OVERFLOW_SCROLL)
if (hasOverflowScroll())
return true;
#endif
- return !isNormalFlowOnly() || renderer()->hasReflection() || renderer()->hasMask() || renderer()->isTableRow() || renderer()->isVideo() || renderer()->isEmbeddedObject() || renderer()->isRenderIFrame();
-=======
return !isNormalFlowOnly()
|| renderer()->hasReflection()
|| renderer()->hasMask()
@@ -3818,7 +3815,6 @@ bool RenderLayer::isSelfPaintingLayer() const
|| renderer()->isEmbeddedObject()
|| renderer()->isApplet()
|| renderer()->isRenderIFrame();
->>>>>>> webkit.org at r71558
}
void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle*)
diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index a007a2c..d158284 100644
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -243,25 +243,19 @@ void RenderTable::computeLogicalWidth()
setLogicalWidth(max(logicalWidth(), minPreferredLogicalWidth()));
// Finally, with our true width determined, compute our margins for real.
-<<<<<<< HEAD
- m_marginRight = 0;
- m_marginLeft = 0;
+ setMarginStart(0);
+ setMarginEnd(0);
#ifdef ANDROID_LAYOUT
// in SSR mode, we ignore left/right margin for table
if (document()->settings()->layoutAlgorithm() == Settings::kLayoutSSR)
return;
#endif
- computeInlineDirectionMargins(cb, availableWidth, width());
-=======
- setMarginStart(0);
- setMarginEnd(0);
if (!hasPerpendicularContainingBlock)
computeInlineDirectionMargins(cb, availableLogicalWidth, logicalWidth());
else {
setMarginStart(style()->marginStart().calcMinValue(availableLogicalWidth));
setMarginEnd(style()->marginEnd().calcMinValue(availableLogicalWidth));
}
->>>>>>> webkit.org at r71558
}
void RenderTable::layout()
@@ -281,12 +275,11 @@ void RenderTable::layout()
initMaxMarginValues();
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
bool relayoutChildren = false;
#endif
- int oldWidth = width();
+ int oldLogicalWidth = logicalWidth();
computeLogicalWidth();
#ifdef ANDROID_LAYOUT
@@ -318,13 +311,7 @@ void RenderTable::layout()
}
}
#endif
- if (m_caption && width() != oldWidth)
-=======
- int oldLogicalWidth = logicalWidth();
- computeLogicalWidth();
-
if (m_caption && logicalWidth() != oldLogicalWidth)
->>>>>>> webkit.org at r71558
m_caption->setNeedsLayout(true, false);
// FIXME: The optimisation below doesn't work since the internal table
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index b262934..e07461f 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -284,7 +284,6 @@ void RenderTableSection::setCellLogicalWidths()
endCol++;
}
int w = columnPos[endCol] - columnPos[j] - table()->hBorderSpacing();
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
if (table()->isSingleColumn()) {
int b = table()->collapseBorders() ?
@@ -292,16 +291,12 @@ void RenderTableSection::setCellLogicalWidths()
w = table()->width() - (table()->borderLeft() + table()->borderRight() + b);
}
#endif
- int oldWidth = cell->width();
+ int oldLogicalWidth = cell->logicalWidth();
#ifdef ANDROID_LAYOUT
- if (w != oldWidth || (visibleWidth > 0 && visibleWidth != cell->getVisibleWidth())) {
+ if (w != oldLogicalWidth || (visibleWidth > 0 && visibleWidth != cell->getVisibleWidth())) {
#else
- if (w != oldWidth) {
-#endif
-=======
- int oldLogicalWidth = cell->logicalWidth();
if (w != oldLogicalWidth) {
->>>>>>> webkit.org at r71558
+#endif
cell->setNeedsLayout(true);
if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout()) {
if (!statePusher.didPush()) {
@@ -311,14 +306,10 @@ void RenderTableSection::setCellLogicalWidths()
}
cell->repaint();
}
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
- if (w != oldWidth)
+ if (w != oldLogicalWidth)
#endif
- cell->updateWidth(w);
-=======
cell->updateLogicalWidth(w);
->>>>>>> webkit.org at r71558
}
}
}
@@ -338,7 +329,7 @@ int RenderTableSection::calcRowLogicalHeight()
int height = 0;
int spacing = table()->vBorderSpacing();
for (int r = 0; r < m_gridRows; r++)
- height += m_grid[r].height.calcMinValue(0) + (m_grid[r].rowRenderer ? spacing : 0);
+ height += m_grid[r].logicalHeight.calcMinValue(0) + (m_grid[r].rowRenderer ? spacing : 0);
return height;
}
#endif
generated by cgit v1.1 at 2024-06-10 02:19:05 +0000