summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/Android.v8bindings.mk5
-rw-r--r--WebCore/bindings/v8/V8Proxy.cpp10
-rw-r--r--WebCore/css/CSSParser.cpp86
-rw-r--r--WebCore/loader/ResourceLoader.cpp7
-rw-r--r--WebCore/platform/graphics/MediaPlayer.cpp4
-rw-r--r--WebCore/platform/image-decoders/ImageDecoder.cpp4
-rw-r--r--WebCore/rendering/RenderBlockLineLayout.cpp5
-rw-r--r--WebCore/rendering/RenderView.cpp21
8 files changed, 18 insertions, 124 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 84acbfa..d91b601 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -173,12 +173,7 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8SVGDocumentCustom.cpp \
bindings/v8/custom/V8SVGElementCustom.cpp \
bindings/v8/custom/V8SVGLengthCustom.cpp \
-<<<<<<< HEAD
- bindings/v8/custom/V8SVGMatrixCustom.cpp \
bindings/v8/custom/V8SVGPathSegCustom.cpp
-=======
- bindings/v8/custom/V8SVGPathSegCustom.cpp \
->>>>>>> webkit.org at r72274
endif
LOCAL_SRC_FILES += \
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 66b9ee7..8dc1487 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -244,21 +244,17 @@ V8Proxy::~V8Proxy()
windowShell()->destroyGlobal();
}
-<<<<<<< HEAD
-v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
+v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, const TextPosition0& scriptStartPosition, v8::ScriptData* scriptData)
#ifdef ANDROID_INSTRUMENT
{
android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter);
- v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, baseLine, scriptData);
+ v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, scriptStartPosition, scriptData);
android::TimeCounter::record(android::TimeCounter::JavaScriptParseTimeCounter, __FUNCTION__);
return script;
}
-v8::Handle<v8::Script> V8Proxy::compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
+v8::Handle<v8::Script> V8Proxy::compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, const TextPosition0& scriptStartPosition, v8::ScriptData* scriptData)
#endif
-=======
-v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, const TextPosition0& scriptStartPosition, v8::ScriptData* scriptData)
->>>>>>> webkit.org at r72274
{
const uint16_t* fileNameString = fromWebCoreString(fileName);
v8::Handle<v8::String> name = v8::String::New(fileNameString, fileName.length());
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index df222b9..1e30272 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -363,15 +363,13 @@ void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorLi
cssyyparse(this);
m_selectorListForParseSelector = 0;
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
- android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
-=======
// The style sheet will be deleted right away, so it won't outlive the document.
ASSERT(dummyStyleSheet->hasOneRef());
->>>>>>> webkit.org at r72274
+
+#ifdef ANDROID_INSTRUMENT
+ android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
+#endif
}
bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const String& string, RefPtr<CSSStyleSourceData>* styleSourceData)
@@ -5643,82 +5641,6 @@ void CSSParser::endDeclarationsForMarginBox()
m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
}
-<<<<<<< HEAD
-void CSSParser::clearVariables()
-{
- m_variableNames.clear();
- m_variableValues.clear();
-}
-
-bool CSSParser::parseVariable(CSSVariablesDeclaration* declaration, const String& variableName, const String& variableValue)
-{
-#ifdef ANDROID_INSTRUMENT
- android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
- m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
- String nameValuePair = variableName + ": ";
- nameValuePair += variableValue;
-
- setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
- cssyyparse(this);
- m_rule = 0;
-
- bool ok = false;
- if (m_variableNames.size()) {
- ok = true;
- declaration->addParsedVariable(variableName, m_variableValues[0]);
- }
-
- clearVariables();
-
-#ifdef ANDROID_INSTRUMENT
- android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
- return ok;
-}
-
-void CSSParser::parsePropertyWithResolvedVariables(int propId, bool isImportant, CSSMutableStyleDeclaration* declaration, CSSParserValueList* list)
-{
- m_valueList = list;
- m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
- if (parseValue(propId, isImportant))
- declaration->addParsedProperties(m_parsedProperties, m_numParsedProperties);
-
- clearProperties();
- m_valueList = 0;
-}
-
-bool CSSParser::checkForVariables(CSSParserValueList* valueList)
-{
- if (!valueList || !valueList->containsVariables())
- return false;
-
- bool hasVariables = false;
- for (unsigned i = 0; i < valueList->size(); ++i) {
- if (valueList->valueAt(i)->isVariable()) {
- hasVariables = true;
- break;
- }
-
- if (valueList->valueAt(i)->unit == CSSParserValue::Function && checkForVariables(valueList->valueAt(i)->function->args.get())) {
- hasVariables = true;
- break;
- }
- }
-
- return hasVariables;
-}
-
-void CSSParser::addUnresolvedProperty(int propId, bool important)
-{
- RefPtr<CSSVariableDependentValue> val = CSSVariableDependentValue::create(CSSValueList::createFromParserValueList(m_valueList));
- addProperty(propId, val.release(), important);
-}
-
-=======
->>>>>>> webkit.org at r72274
void CSSParser::deleteFontFaceOnlyValues()
{
ASSERT(m_hasFontFaceOnlyValues);
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index 42b6092..4522965 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -144,15 +144,10 @@ void ResourceLoader::start()
return;
}
-<<<<<<< HEAD
#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size
- if (m_documentLoader->scheduleArchiveLoad(this, clientRequest, r.url()))
- return true;
-#endif
-=======
if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url()))
return;
->>>>>>> webkit.org at r72274
+#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_request, m_request.url()))
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 83e84d9..dc743bf 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -64,12 +64,10 @@
#endif
#elif PLATFORM(CHROMIUM)
#include "MediaPlayerPrivateChromium.h"
-<<<<<<< HEAD
+#define PlatformMediaEngineClassName MediaPlayerPrivate
#elif PLATFORM(ANDROID)
#include "MediaPlayerPrivateAndroid.h"
-=======
#define PlatformMediaEngineClassName MediaPlayerPrivate
->>>>>>> webkit.org at r72274
#endif
namespace WebCore {
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index a9d5131..49c2a61 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -53,15 +53,11 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const
return bytesExtracted;
}
-<<<<<<< HEAD
#if !OS(ANDROID)
// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and
// JPEGDecoder, which aren't used on Android, and which don't all compile.
// TODO: Find a better fix.
-ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha)
-=======
ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
->>>>>>> webkit.org at r72274
{
// We need at least 4 bytes to figure out what kind of image we're dealing
// with.
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index b6dc39f..127ffe0 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -641,7 +641,6 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
if (fullLayout || o->selfNeedsLayout())
dirtyLineBoxesForRenderer(o, fullLayout);
o->setNeedsLayout(false);
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
if (doTextWrap && !hasTextToWrap && o->isText()) {
Node* node = o->node();
@@ -662,10 +661,6 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
}
}
#endif
- if (!o->isText())
- toRenderInline(o)->invalidateVerticalPosition(); // FIXME: Should do better here and not always invalidate everything.
-=======
->>>>>>> webkit.org at r72274
}
o = bidiNext(this, o, 0, false, &endOfInline);
}
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index 2885f15..8672ff4 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -321,17 +321,6 @@ void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, I
if (printing())
return;
-<<<<<<< HEAD
-#ifdef ANDROID_FIXED_ELEMENTS
-#if ENABLE(COMPOSITED_FIXED_ELEMENTS)
- const Settings * settings = document()->settings();
- if (settings && (settings->viewportWidth() == -1 || settings->viewportWidth() == 0) &&
- !settings->viewportUserScalable())
-#else
- if (false)
-#endif
-#endif
-=======
if (style()->isFlippedBlocksWritingMode()) {
// We have to flip by hand since the view's logical height has not been determined. We
// can use the viewport width and height.
@@ -341,7 +330,15 @@ void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, I
rect.setX(viewWidth() - rect.right());
}
->>>>>>> webkit.org at r72274
+#ifdef ANDROID_FIXED_ELEMENTS
+#if ENABLE(COMPOSITED_FIXED_ELEMENTS)
+ const Settings * settings = document()->settings();
+ if (settings && (settings->viewportWidth() == -1 || settings->viewportWidth() == 0) &&
+ !settings->viewportUserScalable())
+#else
+ if (false)
+#endif
+#endif
if (fixed && m_frameView)
rect.move(m_frameView->scrollX(), m_frameView->scrollY());
generated by cgit v1.1 at 2025-05-15 07:49:23 +0000