Merge Webkit at r64264 : Fix conflicts.

Tracs of the changes:
WebCore/html/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp

WebCore/page/EventHandler.cpp
WebCore/page/EventHandler.h
http://trac.webkit.org/changeset/63888

WebCore/page/Page.cpp
http://trac.webkit.org/changeset/64208

WebCore/page/Settings.cpp
WebCore/page/Settings.h
http://trac.webkit.org/changeset/64110

WebCore/rendering/RenderLayerCompositor.h
http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h

WebCore/rendering/RenderTableSection.cpp
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp

WebCore/rendering/break_lines.cpp
http://trac.webkit.org/changeset/64207

Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207

10 files changed, 8 insertions, 56 deletions

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index ed618b0..30948fa 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -645,13 +645,10 @@
    This prevents unnecessary invals. */
 #define ENABLE_TEXT_CARET 1
 #define ENABLE_JAVASCRIPT_DEBUGGER 0
-<<<<<<< HEAD
 #define ENABLE_ORIENTATION_EVENTS 1
-=======
 #if !defined(ENABLE_JIT) && !ENABLE(ANDROID_JSC_JIT)
 #define ENABLE_JIT 0
 #endif
->>>>>>> webkit.org at r64264
 #endif
 
 #if PLATFORM(WIN)
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp
index 4c5c273..81a2974 100644
--- a/WebCore/html/HTMLDocumentParser.cpp
+++ b/WebCore/html/HTMLDocumentParser.cpp
@@ -227,23 +227,10 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
     if (m_parserStopped)
         return;
 
-<<<<<<< HEAD
-    if (m_scriptRunner && !m_scriptRunner->inScriptExecution() && m_input.haveSeenEndOfFile()) {
-        // document.write was called without a current insertion point.
-        // According to the spec, we're supposed to implicitly open the
-        // document.  Unfortunately, that behavior isn't sufficiently compatible
-        // with the web.  The working group is mulling over what exactly to
-        // do.  In the meantime, we're going to try one of the potential
-        // solutions, which is to ignore the write.
-        // http://www.w3.org/Bugs/Public/show_bug.cgi?id=9767
-        return;
-    }
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
 #endif
 
-=======
->>>>>>> webkit.org at r64264
     {
         NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel);
 
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 466ddf5..9816814 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -870,15 +870,11 @@ void EventHandler::allowDHTMLDrag(bool& flagDHTML, bool& flagUA) const
 }
 #endif // ENABLE(DRAG_SUPPORT)
     
-<<<<<<< HEAD
 #ifdef ANDROID_HITTEST_WITHSIZE
-HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, int hitType, const IntSize& pointPadding)
+HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, HitTestRequest::HitTestRequestType hitType, const IntSize& pointPadding)
 #else
-HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, int hitType)
-#endif
-=======
 HitTestResult EventHandler::hitTestResultAtPoint(const IntPoint& point, bool allowShadowContent, bool ignoreClipping, HitTestScrollbars testScrollbars, HitTestRequest::HitTestRequestType hitType)
->>>>>>> webkit.org at r64264
+#endif
 {
 #ifdef ANDROID_HITTEST_WITHSIZE
     HitTestResult result(point, pointPadding);
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index 16dadc6..6a5ef4c 100644
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -106,15 +106,11 @@ public:
 
     void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
 
-<<<<<<< HEAD
 #ifdef ANDROID_HITTEST_WITHSIZE
-    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active, const IntSize& pointPadding = IntSize());
+    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active, const IntSize& pointPadding = IntSize());
 #else
-    HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active);
-#endif
-=======
     HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active);
->>>>>>> webkit.org at r64264
+#endif
 
     bool mousePressed() const { return m_mousePressed; }
     void setMousePressed(bool pressed) { m_mousePressed = pressed; }
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index c997645..6db0e73 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -128,7 +128,6 @@ static void networkStateChanged()
         frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 static void onPackageResultAvailable()
 {
@@ -140,12 +139,8 @@ static void onPackageResultAvailable()
 }
 #endif
 
-Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient, BackForwardControllerClient* backForwardControllerClient)
-    : m_chrome(new Chrome(this, chromeClient))
-=======
 Page::Page(const PageClients& pageClients)
     : m_chrome(new Chrome(this, pageClients.chromeClient))
->>>>>>> webkit.org at r64264
     , m_dragCaretController(new SelectionController(0, true))
 #if ENABLE(DRAG_SUPPORT)
     , m_dragController(new DragController(this, pageClients.dragClient))
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 88bf484..6ec65c2 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -150,13 +150,10 @@ Settings::Settings(Page* page)
     , m_paginateDuringLayoutEnabled(false)
     , m_dnsPrefetchingEnabled(true)
     , m_memoryInfoEnabled(false)
-<<<<<<< HEAD
+    , m_interactiveFormValidation(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_interactiveFormValidation(false)
->>>>>>> webkit.org at r64264
 {
     // 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 bae035f..32a027e 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -511,13 +511,10 @@ namespace WebCore {
         bool m_paginateDuringLayoutEnabled : 1;
         bool m_dnsPrefetchingEnabled : 1;
         bool m_memoryInfoEnabled: 1;
-<<<<<<< HEAD
+        bool m_interactiveFormValidation: 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_interactiveFormValidation: 1;
->>>>>>> webkit.org at r64264
     
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;
diff --git a/WebCore/rendering/RenderLayerCompositor.h b/WebCore/rendering/RenderLayerCompositor.h
index aa27003..67623d4 100644
--- a/WebCore/rendering/RenderLayerCompositor.h
+++ b/WebCore/rendering/RenderLayerCompositor.h
@@ -214,16 +214,13 @@ private:
     bool requiresCompositingForIFrame(RenderObject*) const;
     bool requiresCompositingWhenDescendantsAreCompositing(RenderObject*) const;
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
     // Whether we are on a mobile site
     bool requiresCompositingForMobileSites(const RenderLayer* layer) const;
 #endif
 
-=======
     bool requiresScrollLayer(RootLayerAttachment) const;
     
->>>>>>> webkit.org at r64264
 private:
     RenderView* m_renderView;
     OwnPtr<GraphicsLayer> m_rootPlatformLayer;
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index dcaa2f5..28da126 100644
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -1151,13 +1151,11 @@ void RenderTableSection::paintObject(PaintInfo& paintInfo, int tx, int ty)
         if (!endcol && tx + table()->columnPositions()[0] - table()->outerBorderLeft() <= y + w + os)
             endcol++;
     }
-<<<<<<< HEAD
+
 #ifdef ANDROID_LAYOUT
     }
 #endif
 
-=======
->>>>>>> webkit.org at r64264
     if (startcol < endcol) {
         if (!m_hasMultipleCellLevels) {
             // Draw the dirty cells in the order that they appear.
diff --git a/WebCore/rendering/break_lines.cpp b/WebCore/rendering/break_lines.cpp
index 307fb6f..054cd43 100644
--- a/WebCore/rendering/break_lines.cpp
+++ b/WebCore/rendering/break_lines.cpp
@@ -125,17 +125,10 @@ static inline bool shouldBreakAfter(UChar ch, UChar nextCh)
         // FIXME: cases for ideographicComma and ideographicFullStop are a workaround for an issue in Unicode 5.0
         // which is likely to be resolved in Unicode 5.1 <http://bugs.webkit.org/show_bug.cgi?id=17411>.
         // We may want to remove or conditionalize this workaround at some point.
-<<<<<<< HEAD
-        case ideographicComma:
-        case ideographicFullStop:
 #ifdef ANDROID_LAYOUT
         // as '/' is used in uri which is always long, we would like to break it
-        case '/':
+    case '/':
 #endif
-            return true;
-        default:
-            return false;
-=======
         return true;
     default:
         // If both ch and nextCh are ASCII characters, use a lookup table for enhanced speed and for compatibility
@@ -148,7 +141,6 @@ static inline bool shouldBreakAfter(UChar ch, UChar nextCh)
         }
         // Otherwise defer to the Unicode algorithm by returning false.
         return false;
->>>>>>> webkit.org at r64264
     }
 }