summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/Android.derived.v8bindings.mk8
-rw-r--r--WebCore/Android.jscbindings.mk6
-rw-r--r--WebCore/Android.mk6
-rw-r--r--WebCore/css/CSSStyleSelector.cpp5
-rw-r--r--WebCore/page/Settings.cpp5
-rw-r--r--WebCore/page/Settings.h14
-rw-r--r--WebCore/rendering/RenderBox.h10
7 files changed, 13 insertions, 41 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index b8e48ae..ba2b8db 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -146,7 +146,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
GEN := \
$(intermediates)/bindings/V8Blob.h \
$(intermediates)/bindings/V8BlobBuilder.h \
-<<<<<<< HEAD
$(intermediates)/bindings/V8DOMFileSystem.h \
$(intermediates)/bindings/V8DOMFileSystemSync.h \
$(intermediates)/bindings/V8DirectoryEntry.h \
@@ -160,12 +159,6 @@ GEN := \
$(intermediates)/bindings/V8EntryCallback.h \
$(intermediates)/bindings/V8EntrySync.h \
$(intermediates)/bindings/V8ErrorCallback.h \
-=======
- $(intermediates)/bindings/V8DOMTokenList.h \
- $(intermediates)/bindings/V8DOMSettableTokenList.h \
- $(intermediates)/bindings/V8DataGridColumn.h \
- $(intermediates)/bindings/V8DataGridColumnList.h \
->>>>>>> webkit.org at r70949
$(intermediates)/bindings/V8File.h \
$(intermediates)/bindings/V8FileCallback.h \
$(intermediates)/bindings/V8FileEntry.h \
@@ -195,6 +188,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
# HTML
GEN := \
$(intermediates)/bindings/V8DOMFormData.h \
+ $(intermediates)/bindings/V8DOMSettableTokenList.h \
$(intermediates)/bindings/V8DOMTokenList.h \
$(intermediates)/bindings/V8DataGridColumn.h \
$(intermediates)/bindings/V8DataGridColumnList.h \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 80e9516..6699ad8 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -88,15 +88,12 @@ LOCAL_SRC_FILES += \
bindings/js/JSDOMBinding.cpp \
bindings/js/JSDOMFormDataCustom.cpp \
bindings/js/JSDOMGlobalObject.cpp \
-<<<<<<< HEAD
bindings/js/JSDOMMimeTypeArrayCustom.cpp \
bindings/js/JSDOMPluginArrayCustom.cpp \
bindings/js/JSDOMPluginCustom.cpp \
bindings/js/JSDOMStringMapCustom.cpp \
-=======
bindings/js/JSDOMSettableTokenList.cpp \
bindings/js/JSDOMTokenList.cpp \
->>>>>>> webkit.org at r70949
bindings/js/JSDOMWindowBase.cpp \
bindings/js/JSDOMWindowCustom.cpp \
bindings/js/JSDOMWindowShell.cpp \
@@ -115,11 +112,8 @@ LOCAL_SRC_FILES += \
bindings/js/JSEventListener.cpp \
bindings/js/JSEventTarget.cpp \
bindings/js/JSExceptionBase.cpp \
-<<<<<<< HEAD
bindings/js/JSFloat32ArrayCustom.cpp \
-=======
bindings/js/JSFileReaderCustom.cpp \
->>>>>>> webkit.org at r70949
bindings/js/JSGeolocationCustom.cpp \
bindings/js/JSHTMLAllCollectionCustom.cpp \
bindings/js/JSHTMLAppletElementCustom.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index eadb310..acb6285 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -292,13 +292,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/parser/CSSPreloadScanner.cpp \
html/ColorInputType.cpp \
html/DOMFormData.cpp \
-<<<<<<< HEAD
- html/DOMTokenList.cpp \
- html/DateComponents.cpp \
-=======
html/DOMSettableTokenList.cpp \
html/DOMTokenList.cpp \
->>>>>>> webkit.org at r70949
+ html/DateComponents.cpp \
html/DateInputType.cpp \
html/DateTimeInputType.cpp \
html/DateTimeLocalInputType.cpp \
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 881bf74..b0201a3 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -5603,7 +5603,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
if (m_style->setFontDescription(fontDescription))
m_fontDirty = true;
return;
-<<<<<<< HEAD
+ }
#ifdef ANDROID_CSS_RING
case CSSPropertyWebkitRing:
@@ -5749,9 +5749,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
}
#endif
-=======
- }
->>>>>>> webkit.org at r70949
#if ENABLE(SVG)
default:
// Try the SVG properties
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 66ffcf0..acfe23a 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -161,16 +161,13 @@ Settings::Settings(Page* page)
, m_interactiveFormValidation(false)
, m_usePreHTML5ParserQuirks(false)
, m_hyperlinkAuditingEnabled(false)
-<<<<<<< HEAD
+ , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
#if ENABLE(WEB_AUTOFILL)
, m_autoFillEnabled(false)
#endif
#ifdef ANDROID_PLUGINS
, m_pluginsOnDemand(false)
#endif
-=======
- , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
->>>>>>> webkit.org at r70949
{
// A Frame may not have been created yet, so we initialize the AtomicString
// hash before trying to use it.
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 8324e2f..b5e6fe1 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -400,15 +400,13 @@ namespace WebCore {
void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
-<<<<<<< HEAD
+ void setCrossOriginCheckInGetMatchedCSSRulesDisabled(bool flag) { m_crossOriginCheckInGetMatchedCSSRulesDisabled = flag; }
+ bool crossOriginCheckInGetMatchedCSSRulesDisabled() const { return m_crossOriginCheckInGetMatchedCSSRulesDisabled; }
+
#if ENABLE(WEB_AUTOFILL)
void setAutoFillEnabled(bool flag) { m_autoFillEnabled = flag; }
bool autoFillEnabled() { return m_autoFillEnabled; }
#endif
-=======
- void setCrossOriginCheckInGetMatchedCSSRulesDisabled(bool flag) { m_crossOriginCheckInGetMatchedCSSRulesDisabled = flag; }
- bool crossOriginCheckInGetMatchedCSSRulesDisabled() const { return m_crossOriginCheckInGetMatchedCSSRulesDisabled; }
->>>>>>> webkit.org at r70949
private:
Page* m_page;
@@ -535,16 +533,14 @@ namespace WebCore {
bool m_interactiveFormValidation: 1;
bool m_usePreHTML5ParserQuirks: 1;
bool m_hyperlinkAuditingEnabled : 1;
-<<<<<<< HEAD
+ bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
+
#ifdef ANDROID_PLUGINS
bool m_pluginsOnDemand : 1;
#endif
#if ENABLE(WEB_AUTOFILL)
bool m_autoFillEnabled: 1;
#endif
-=======
- bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
->>>>>>> webkit.org at r70949
#if USE(SAFARI_THEME)
static bool gShouldPaintNativeControls;
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index bcf95e9..3b261bd 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -377,16 +377,14 @@ public:
virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
virtual int baselinePosition(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
-<<<<<<< HEAD
-#ifdef ANDROID_LAYOUT
- int getVisibleWidth() const { return m_visibleWidth; }
-#endif
-=======
enum FlippingAdjustment { ChildToParentFlippingAdjustment, ParentToChildFlippingAdjustment };
void adjustForFlippedBlocksWritingMode(RenderBox* child, IntPoint&, FlippingAdjustment);
int convertFromFlippedWritingMode(int position);
IntSize locationOffsetIncludingFlipping();
->>>>>>> webkit.org at r70949
+
+#ifdef ANDROID_LAYOUT
+ int getVisibleWidth() const { return m_visibleWidth; }
+#endif
protected:
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
generated by cgit v1.1 at 2025-05-28 18:18:38 +0000