Merge WebKit at r60074: Fix conflicts

DeviceOrientation
- WebCore/Android.derived.jscbindings.mk
- WebCore/Android.derived.v8bindings.mk
- WebCore/page/Page.cpp

Trivial
- WebCore/css/CSSParser.cpp
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
- WebCore/rendering/style/RenderStyle.h

Code deletion - See http://trac.webkit.org/changeset/59749
- WebCore/html/HTMLTokenizer.cpp

PluginView JSC guards uspstreaming
- WebCore/plugins/PluginView.cpp
- WebCore/plugins/PluginView.h

Refactoring, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderLayer.cpp

RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784
- WebCore/rendering/RenderBlock.h

Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6

diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index fa11703..70ef7cd 100644 (file)
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -49,11 +49,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
                        bindings/scripts/generate-bindings.pl \
                )
 
-<<<<<<< HEAD
-FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1
-=======
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_DEVICE_ORIENTATION=1
->>>>>>> webkit.org at r60074
+FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1
 
 # CSS
 GEN := \

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 81f9f4d..4b06dd2 100644 (file)
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -30,12 +30,8 @@ js_binding_scripts := \
        $(LOCAL_PATH)/bindings/scripts/IDLStructure.pm \
        $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl
 
-<<<<<<< HEAD
 # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support
-FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1
-=======
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_DEVICE_ORIENTATION=1
->>>>>>> webkit.org at r60074
+FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1
 FEATURE_DEFINES += V8_BINDING
 
 # CSS

diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index ac8d94d..91b0f98 100644 (file)
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -351,14 +351,10 @@ bool CSSParser::parseColor(CSSMutableStyleDeclaration* declaration, const String
 }
 
 void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorList& selectorList)
-<<<<<<< HEAD
-{    
+{
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-=======
-{
->>>>>>> webkit.org at r60074
     RefPtr<CSSStyleSheet> dummyStyleSheet = CSSStyleSheet::create(doc);
 
     m_styleSheet = dummyStyleSheet.get();

diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index 620913f..a0877ff 100644 (file)
--- a/WebCore/html/HTMLTokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -1812,15 +1812,11 @@ void HTMLTokenizer::write(const SegmentedString& str, bool appendData)
     bool wasInWrite = m_inWrite;
     m_inWrite = true;
 
-<<<<<<< HEAD
-    int processedCount = 0;
-    double startTime = currentTime();
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
 #endif
-=======
+
     willWriteHTML(source);
->>>>>>> webkit.org at r60074
 
     Frame* frame = m_doc->frame();
     State state = m_state;

diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 1988040..ae7c9ad 100644 (file)
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -113,7 +113,6 @@ static void networkStateChanged()
         frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
 }
 
-<<<<<<< HEAD
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 static void onPackageResultAvailable()
 {
@@ -125,10 +124,7 @@ static void onPackageResultAvailable()
 }
 #endif
 
-Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient)
-=======
 Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient)
->>>>>>> webkit.org at r60074
     : m_chrome(new Chrome(this, chromeClient))
     , m_dragCaretController(new SelectionController(0, true))
 #if ENABLE(DRAG_SUPPORT)

diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 883875b..268d8ae 100644 (file)
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -144,13 +144,10 @@ Settings::Settings(Page* page)
     , m_webGLEnabled(false)
     , m_loadDeferringEnabled(true)
     , m_tiledBackingStoreEnabled(false)
-<<<<<<< HEAD
+    , m_html5ParserEnabled(false)
 #ifdef ANDROID_PLUGINS
     , m_pluginsOnDemand(false)
 #endif
-=======
-    , m_html5ParserEnabled(false)
->>>>>>> webkit.org at r60074
 {
     // 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 9b76517..2f9637b 100644 (file)
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -493,13 +493,10 @@ namespace WebCore {
         bool m_webGLEnabled : 1;
         bool m_loadDeferringEnabled : 1;
         bool m_tiledBackingStoreEnabled : 1;
-<<<<<<< HEAD
+        bool m_html5ParserEnabled: 1;
 #ifdef ANDROID_PLUGINS
         bool m_pluginsOnDemand : 1;
 #endif
-=======
-        bool m_html5ParserEnabled: 1;
->>>>>>> webkit.org at r60074
 
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;

diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 42d98a8..3518443 100644 (file)
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -65,13 +65,10 @@
 #include "PluginMessageThrottlerWin.h"
 #endif
 
-<<<<<<< HEAD
 #if defined(ANDROID_PLUGINS)
 #include "TouchEvent.h"
 #endif
 
-=======
->>>>>>> webkit.org at r60074
 #if USE(JSC)
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
@@ -800,10 +797,9 @@ PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
     return instance.release();
 #else
     return 0;
-#endif  // NETSCAPE_PLUGIN_API
+#endif
 }
-<<<<<<< HEAD
-#endif  // JSC
+#endif
 
 #if USE(V8)
 // This is really JS engine independent
@@ -835,9 +831,6 @@ NPObject* PluginView::getNPObject() {
 #endif  // NETSCAPE_PLUGIN_API
 }
 #endif  // V8
-=======
-#endif
->>>>>>> webkit.org at r60074
 
 void PluginView::disconnectStream(PluginStream* stream)
 {

diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index f4474cc..cc36665 100644 (file)
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -70,11 +70,8 @@ namespace JSC {
     }
 }
 #endif
-<<<<<<< HEAD
 
 class NPObject;
-=======
->>>>>>> webkit.org at r60074
 
 namespace WebCore {
     class Element;

diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h
index 9eb1c0f..450912a 100644 (file)
--- a/WebCore/rendering/RenderBlock.h
+++ b/WebCore/rendering/RenderBlock.h
@@ -355,27 +355,8 @@ private:
 
     int desiredColumnWidth() const;
     unsigned desiredColumnCount() const;
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-public:
-#endif
-    Vector<IntRect>* columnRects() const;
-#if PLATFORM(ANDROID)
-private:
-#endif
-    void setDesiredColumnCountAndWidth(int count, int width);
-#if PLATFORM(ANDROID)
-public:
-#endif
-    int columnGap() const;
-#if PLATFORM(ANDROID)
-private:
-#endif
-    
-=======
     void setDesiredColumnCountAndWidth(int count, int width);
 
->>>>>>> webkit.org at r60074
     void paintContinuationOutlines(PaintInfo&, int tx, int ty);
 
     virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 8c7f23d..7477d77 100644 (file)
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -2844,58 +2844,6 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
     RenderLayer* candidateLayer = 0;
 
     // Begin by walking our list of positive layers from highest z-index down to the lowest z-index.
-<<<<<<< HEAD
-    if (m_posZOrderList) {
-        for (int i = m_posZOrderList->size() - 1; i >= 0; --i) {
-#ifdef ANDROID_HITTEST_WITHSIZE
-            HitTestResult tempResult(result.point(), result.pointPadding());
-#else
-            HitTestResult tempResult(result.point());
-#endif
-            RenderLayer* hitLayer = m_posZOrderList->at(i)->hitTestLayer(rootLayer, this, request, tempResult, hitTestRect, hitTestPoint, false, localTransformState.get(), zOffsetForDescendantsPtr);
-#ifdef ANDROID_HITTEST_WITHSIZE
-            if (result.isRegionTest())
-                result.merge(tempResult);
-#endif
-            if (isHitCandidate(hitLayer, depthSortDescendants, zOffset, unflattenedTransformState.get())) {
-#ifdef ANDROID_HITTEST_WITHSIZE
-                if (!result.isRegionTest())
-#endif
-                result = tempResult;
-                if (!depthSortDescendants)
-                    return hitLayer;
-
-                candidateLayer = hitLayer;
-            }
-        }
-    }
-
-    // Now check our overflow objects.
-    if (m_normalFlowList) {
-        for (int i = m_normalFlowList->size() - 1; i >= 0; --i) {
-            RenderLayer* currLayer = m_normalFlowList->at(i);
-#ifdef ANDROID_HITTEST_WITHSIZE
-            HitTestResult tempResult(result.point(), result.pointPadding());
-#else
-            HitTestResult tempResult(result.point());
-#endif
-            RenderLayer* hitLayer = currLayer->hitTestLayer(rootLayer, this, request, tempResult, hitTestRect, hitTestPoint, false, localTransformState.get(), zOffsetForDescendantsPtr);
-#ifdef ANDROID_HITTEST_WITHSIZE
-            if (result.isRegionTest())
-                result.merge(tempResult);
-#endif
-            if (isHitCandidate(hitLayer, depthSortDescendants, zOffset, unflattenedTransformState.get())) {
-#ifdef ANDROID_HITTEST_WITHSIZE
-                if (!result.isRegionTest())
-#endif
-                result = tempResult;
-                if (!depthSortDescendants)
-                    return hitLayer;
-
-                candidateLayer = hitLayer;
-            }
-        }
-=======
     RenderLayer* hitLayer = hitTestList(m_posZOrderList, rootLayer, request, result, hitTestRect, hitTestPoint,
                                         localTransformState.get(), zOffsetForDescendantsPtr, zOffset, unflattenedTransformState.get(), depthSortDescendants);
     if (hitLayer) {
@@ -2911,7 +2859,6 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
         if (!depthSortDescendants)
             return hitLayer;
         candidateLayer = hitLayer;
->>>>>>> webkit.org at r60074
     }
 
     // Next we want to see if the mouse pos is inside the child RenderObjects of the layer.
@@ -2946,38 +2893,12 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
     }
 
     // Now check our negative z-index children.
-<<<<<<< HEAD
-    if (m_negZOrderList) {
-        for (int i = m_negZOrderList->size() - 1; i >= 0; --i) {
-#ifdef ANDROID_HITTEST_WITHSIZE
-            HitTestResult tempResult(result.point(), result.pointPadding());
-#else
-            HitTestResult tempResult(result.point());
-#endif
-            RenderLayer* hitLayer = m_negZOrderList->at(i)->hitTestLayer(rootLayer, this, request, tempResult, hitTestRect, hitTestPoint, false, localTransformState.get(), zOffsetForDescendantsPtr);
-#ifdef ANDROID_HITTEST_WITHSIZE
-            if (result.isRegionTest())
-                result.merge(tempResult);
-#endif
-            if (isHitCandidate(hitLayer, depthSortDescendants, zOffset, unflattenedTransformState.get())) {
-#ifdef ANDROID_HITTEST_WITHSIZE
-                if (!result.isRegionTest())
-#endif
-                result = tempResult;
-                if (!depthSortDescendants)
-                    return hitLayer;
-
-                candidateLayer = hitLayer;
-            }
-        }
-=======
     hitLayer = hitTestList(m_negZOrderList, rootLayer, request, result, hitTestRect, hitTestPoint,
                                         localTransformState.get(), zOffsetForDescendantsPtr, zOffset, unflattenedTransformState.get(), depthSortDescendants);
     if (hitLayer) {
         if (!depthSortDescendants)
             return hitLayer;
         candidateLayer = hitLayer;
->>>>>>> webkit.org at r60074
     }
 
     // If we found a layer, return. Child layers, and foreground always render in front of background.
@@ -3051,12 +2972,23 @@ RenderLayer* RenderLayer::hitTestList(Vector<RenderLayer*>* list, RenderLayer* r
     for (int i = list->size() - 1; i >= 0; --i) {
         RenderLayer* childLayer = list->at(i);
         RenderLayer* hitLayer = 0;
+#ifdef ANDROID_HITTEST_WITHSIZE
+        HitTestResult tempResult(result.point(), result.pointPadding());
+#else
         HitTestResult tempResult(result.point());
+#endif
         if (childLayer->isPaginated())
             hitLayer = hitTestPaginatedChildLayer(childLayer, rootLayer, request, tempResult, hitTestRect, hitTestPoint, transformState, zOffsetForDescendants);
         else
             hitLayer = childLayer->hitTestLayer(rootLayer, this, request, tempResult, hitTestRect, hitTestPoint, false, transformState, zOffsetForDescendants);
+#ifdef ANDROID_HITTEST_WITHSIZE
+        if (result.isRegionTest())
+            result.merge(tempResult);
+#endif
         if (isHitCandidate(hitLayer, depthSortDescendants, zOffset, unflattenedTransformState)) {
+#ifdef ANDROID_HITTEST_WITHSIZE
+            if (!result.isRegionTest())
+#endif
             resultLayer = hitLayer;
             result = tempResult;
             if (!depthSortDescendants)

diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index e8f4d2f..0d0066b 100644 (file)
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -1215,11 +1215,10 @@ public:
     static const Vector<StyleDashboardRegion>& noneDashboardRegions();
 #endif
 
-<<<<<<< HEAD
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     static Color initialTapHighlightColor() { return Color::tap; }
 #endif
-=======
+
 private:
     // Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
     const Color& borderLeftColor() const { return surround->border.left().color(); }
@@ -1234,7 +1233,6 @@ private:
     const Color& textStrokeColor() const { return rareInheritedData->textStrokeColor; }
     
     const Color colorIncludingFallback(int colorProperty, EBorderStyle borderStyle) const;
->>>>>>> webkit.org at r60074
 };
 
 } // namespace WebCore