Merge Webkit at r66666 : Fix conflicts.

css/CSSParser.cpp
Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery):
http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp

dom/Document.cpp
Removed a function call next to an Android specific change:
http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp

html/HTMLPlugInElement.cpp
Removed a function next to an Android change:
http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp

page/Settings.h
Whitespace change in this CL:
http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h

svg/SVGFontFaceUriElement.h
Small change next to an Android change:
http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h

Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0

diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 07cd300..5455eed 100644 (file)
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -401,15 +401,11 @@ bool CSSParser::parseMediaQuery(MediaList* queries, const String& string)
     if (string.isEmpty())
         return true;
 
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-    m_mediaQuery = 0;
-=======
     ASSERT(!m_mediaQuery);
 
->>>>>>> webkit.org at r66666
     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
     // instead insert one " " (which is WHITESPACE in CSSGrammar.y)
     setupParser("@-webkit-mediaquery ", string, "} ");

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 99ce273..7fb8c34 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -644,7 +644,6 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
     m_docType = docType;
     if (m_docType)
         m_docType->setDocument(this);
-<<<<<<< HEAD
 #ifdef ANDROID_META_SUPPORT
     if (m_docType && !ownerElement()
             && m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", false)) {
@@ -655,9 +654,6 @@ void Document::setDocType(PassRefPtr<DocumentType> docType)
             android::WebViewCore::getWebViewCore(frameView)->updateViewport();
     }
 #endif
-    determineParseMode();
-=======
->>>>>>> webkit.org at r66666
 }
 
 DOMImplementation* Document::implementation() const

diff --git a/WebCore/html/HTMLPlugInElement.cpp b/WebCore/html/HTMLPlugInElement.cpp
index 88642f7..25ef751 100644 (file)
--- a/WebCore/html/HTMLPlugInElement.cpp
+++ b/WebCore/html/HTMLPlugInElement.cpp
@@ -177,12 +177,6 @@ NPObject* HTMLPlugInElement::getNPObject()
 
 #endif /* ENABLE(NETSCAPE_PLUGIN_API) */
 
-<<<<<<< HEAD
-void HTMLPlugInElement::updateWidgetCallback(Node* n)
-{
-    static_cast<HTMLPlugInElement*>(n)->updateWidget();
-}
-
 #if PLATFORM(ANDROID)
 bool HTMLPlugInElement::supportsFocus() const
 {
@@ -190,6 +184,4 @@ bool HTMLPlugInElement::supportsFocus() const
 }
 #endif
 
-=======
->>>>>>> webkit.org at r66666
 }

diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index b95c62d..654f317 100644 (file)
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -522,14 +522,11 @@ namespace WebCore {
 #endif
         bool m_memoryInfoEnabled: 1;
         bool m_interactiveFormValidation: 1;
-<<<<<<< HEAD
+
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-    
-=======
 
->>>>>>> webkit.org at r66666
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
 #endif

diff --git a/WebCore/svg/SVGFontFaceUriElement.h b/WebCore/svg/SVGFontFaceUriElement.h
index 74999ac..8859ea6 100644 (file)
--- a/WebCore/svg/SVGFontFaceUriElement.h
+++ b/WebCore/svg/SVGFontFaceUriElement.h
@@ -45,7 +45,6 @@ namespace WebCore {
         virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
         virtual void insertedIntoDocument();
 
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
         void* operator new(size_t size) {
             return SVGElement::operator new(size);
@@ -62,9 +61,6 @@ namespace WebCore {
         }
 #endif
 
-    private:
-=======
->>>>>>> webkit.org at r66666
         void loadFont();
 
         CachedResourceHandle<CachedFont> m_cachedFont;