diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 13:18:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | 919eb425b73bb532c128aa974a43e3c959c5a10a (patch) | |
| tree | 8909107d3bed438c3fcf8bbc8f8ea6830f680198 /WebCore/page | |
| parent | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (diff) | |
| download | external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.zip external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.tar.gz external_webkit-919eb425b73bb532c128aa974a43e3c959c5a10a.tar.bz2 | |
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
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/FrameView.cpp | 6 | ||||
| -rw-r--r-- | WebCore/page/Settings.cpp | 6 | ||||
| -rw-r--r-- | WebCore/page/Settings.h | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index dfbe7a2..f43fae5 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 d7bba08..51d387a 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 e22fca5..abf0699 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 |