Merge WebKit at r84325: Fix conflicts.

Platform.h
ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997)
WTF_USE_SKIA (http://trac.webkit.org/changeset/84106)

JSNavigatorCustom.cpp
V8NavigatorCustom.cpp
ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287)

CSSStyleSelector.cpp
ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986)

Document.cpp
ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349)
ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992)

HTMLInputElement.cpp
ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534)

RangeInputType.cpp
ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/)

ChromeClient.h
ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375)

EventHandler.cpp
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522)

Settings
ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201)
ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628)

Gradient.cpp
Graphicscontext.cpp
HTMLCanvasElement.cpp
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088)
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101)

PluginView.h
ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071)

RenderBox.h
ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611)

RenderIframe.cpp (moved code to RenderPart.cpp)
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518)

RenderLayer.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899)

RenderLayer.h
RenderLayerBacking.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820)

Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7

1 files changed, 6 insertions, 12 deletions

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index b85bdfb..8c22da8 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -689,8 +689,8 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
     ASSERT(!m_docType || !docType);
     m_docType = docType;
     if (m_docType)
-<<<<<<< HEAD
-        m_docType->setDocument(this);
+        m_docType->setTreeScope(this);
+
 #ifdef ANDROID_META_SUPPORT
     if (m_docType && !ownerElement()
             && m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", false)) {
@@ -701,9 +701,6 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
             PlatformBridge::updateViewport(frameView);
     }
 #endif
-=======
-        m_docType->setTreeScope(this);
->>>>>>> WebKit.org at r84325
 }
 
 DOMImplementation* Document::implementation()
@@ -1482,19 +1479,16 @@ void Document::recalcStyle(StyleChange change)
     suspendPostAttachCallbacks();
     RenderWidget::suspendWidgetHierarchyUpdates();
     
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CalculateStyleTimeCounter);
-#endif
-    
-=======
     RefPtr<FrameView> frameView = view();
     if (frameView) {
         frameView->pauseScheduledEvents();
         frameView->beginDeferredRepaints();
     }
 
->>>>>>> WebKit.org at r84325
+#ifdef ANDROID_INSTRUMENT
+    android::TimeCounter::start(android::TimeCounter::CalculateStyleTimeCounter);
+#endif
+
     ASSERT(!renderer() || renderArena());
     if (!renderer() || !renderArena())
         goto bail_out;