From 919eb425b73bb532c128aa974a43e3c959c5a10a Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Jul 2010 13:18:23 +0100 Subject: [PATCH] Merge WebKit at r62496: Fix conflicts HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3 --- WebCore/html/HTMLDocumentParser.cpp | 4 ---- WebCore/page/FrameView.cpp | 6 +----- WebCore/page/Settings.cpp | 6 +----- WebCore/page/Settings.h | 6 +----- WebCore/platform/DragData.h | 10 ++-------- WebCore/platform/android/RenderThemeAndroid.cpp | 4 ---- WebCore/platform/android/RenderThemeAndroid.h | 4 ---- 7 files changed, 5 insertions(+), 35 deletions(-) diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp index 55facbfbc..59b839dcd 100644 --- a/WebCore/html/HTMLDocumentParser.cpp +++ b/WebCore/html/HTMLDocumentParser.cpp @@ -222,12 +222,9 @@ void HTMLDocumentParser::insert(const SegmentedString& source) if (m_parserStopped) return; -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter); #endif - NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); -======= { NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); @@ -247,7 +244,6 @@ void HTMLDocumentParser::append(const SegmentedString& source) { NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); ->>>>>>> webkit.org at r62496 m_input.appendToEnd(source); if (m_preloadScanner) diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index dfbe7a248..f43fae55d 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -694,12 +694,8 @@ void FrameView::layout(bool allowSubtree) RenderObject* rootRenderer = documentElement ? documentElement->renderer() : 0; Node* body = document->body(); if (body && body->renderer()) { -<<<<<<< HEAD - if (body->hasTagName(framesetTag) && !m_frame->settings()->frameFlatteningEnabled()) { -#if !defined(ANDROID_FLATTEN_IFRAME) && !defined(ANDROID_FLATTEN_FRAMESET) -======= if (body->hasTagName(framesetTag) && m_frame->settings() && !m_frame->settings()->frameFlatteningEnabled()) { ->>>>>>> webkit.org at r62496 +#if !defined(ANDROID_FLATTEN_IFRAME) && !defined(ANDROID_FLATTEN_FRAMESET) body->renderer()->setChildNeedsLayout(true); vMode = ScrollbarAlwaysOff; hMode = ScrollbarAlwaysOff; diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index d7bba086c..51d387a95 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -147,14 +147,10 @@ Settings::Settings(Page* page) , m_html5ParserEnabled(true) , m_html5TreeBuilderEnabled(false) // Will be deleted soon, do not use. , m_paginateDuringLayoutEnabled(false) -<<<<<<< HEAD + , m_dnsPrefetchingEnabled(true) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif - -======= - , m_dnsPrefetchingEnabled(true) ->>>>>>> webkit.org at r62496 { // 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 e22fca513..abf069916 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -495,15 +495,11 @@ namespace WebCore { bool m_html5ParserEnabled: 1; bool m_html5TreeBuilderEnabled: 1; // Will be deleted soon, do not use. bool m_paginateDuringLayoutEnabled : 1; -<<<<<<< HEAD + bool m_dnsPrefetchingEnabled : 1; #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif - -======= - bool m_dnsPrefetchingEnabled : 1; ->>>>>>> webkit.org at r62496 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; #endif diff --git a/WebCore/platform/DragData.h b/WebCore/platform/DragData.h index 9bad6997f..230e344ae 100644 --- a/WebCore/platform/DragData.h +++ b/WebCore/platform/DragData.h @@ -52,17 +52,12 @@ typedef struct IDataObject* DragDataRef; #elif PLATFORM(WX) typedef class wxDataObject* DragDataRef; #elif PLATFORM(GTK) -<<<<<<< HEAD -// FIXME: this should probably be something gdk-specific -typedef void* DragDataRef; -#elif defined ANDROID -typedef void* DragDataRef; -======= namespace WebCore { class DataObjectGtk; } typedef WebCore::DataObjectGtk* DragDataRef; ->>>>>>> webkit.org at r62496 +#elif defined ANDROID +typedef void* DragDataRef; #elif PLATFORM(CHROMIUM) #include "DragDataRef.h" #elif PLATFORM(HAIKU) @@ -127,4 +122,3 @@ namespace WebCore { } //namespace WebCore #endif //!DragData_h - diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp index 7249507f4..89e571083 100644 --- a/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/WebCore/platform/android/RenderThemeAndroid.cpp @@ -230,7 +230,6 @@ bool RenderThemeAndroid::paintButton(RenderObject* obj, const PaintInfo& info, c return false; } -<<<<<<< HEAD #if ENABLE(VIDEO) String RenderThemeAndroid::extraMediaControlsStyleSheet() @@ -320,10 +319,7 @@ void RenderThemeAndroid::adjustSliderThumbSize(RenderObject* o) const #endif -bool RenderThemeAndroid::paintRadio(RenderObject* obj, const RenderObject::PaintInfo& info, const IntRect& rect) -======= bool RenderThemeAndroid::paintRadio(RenderObject* obj, const PaintInfo& info, const IntRect& rect) ->>>>>>> webkit.org at r62496 { RenderSkinRadio::Draw(getCanvasFromInfo(info), obj->node(), rect, false); return false; diff --git a/WebCore/platform/android/RenderThemeAndroid.h b/WebCore/platform/android/RenderThemeAndroid.h index 26047be45..0bf717523 100644 --- a/WebCore/platform/android/RenderThemeAndroid.h +++ b/WebCore/platform/android/RenderThemeAndroid.h @@ -77,7 +77,6 @@ protected: virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&); virtual void setCheckboxSize(RenderStyle*) const; -<<<<<<< HEAD #if ENABLE(VIDEO) virtual String extraMediaControlsStyleSheet(); virtual void adjustSliderThumbSize(RenderObject* o) const; @@ -91,10 +90,7 @@ protected: virtual bool paintMediaControlsBackground(RenderObject* object, const RenderObject::PaintInfo& paintInfo, const IntRect& rect); #endif - virtual bool paintRadio(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); -======= virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&); ->>>>>>> webkit.org at r62496 virtual void setRadioSize(RenderStyle*) const; virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, WebCore::Element*) const; -- 2.11.0