Merge webkit.org at r54731 : Fix remaining merge conflicts

- AutoFillPopupMenuClient.h - Take theirs, git got confused
- PluginView.h - Conflict due to new OS macro
- Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform
- Android.derived.v8bindings.mk - Keep ours
- DragImage.h - Take both
- V8DocumentCustom.cpp - Take theirs
- XCode project - Take both to keep Android-addition of GeolocationPositionCache

Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15

7 files changed, 3 insertions, 82 deletions

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 810133e..8a24d27 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -561,51 +561,6 @@ GEN := \
     $(intermediates)/bindings/V8InspectorBackend.h \
     $(intermediates)/bindings/V8InspectorFrontendHost.h
 
-<<<<<<< HEAD
-=======
-$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
-$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts)
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
-
-# We also need the .cpp files, which are generated as side effects of the
-# above rules.  Specifying this explicitly makes -j2 work.
-$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
-
-# Notifications
-# These headers are required by the V8 bindings even when Notifications are disabled
-GEN := \
-    $(intermediates)/bindings/V8Notification.h
-
-$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
-$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/notifications/%.idl $(js_binding_scripts)
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
-
-# We also need the .cpp files, which are generated as side effects of the
-# above rules.  Specifying this explicitly makes -j2 work.
-$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
-
-# Web Sockets
-# These headers are required by the V8 bindings even when Web Sockets are disabled
-GEN := \
-    $(intermediates)/bindings/V8WebSocket.h
-
-$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
-$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/websockets/%.idl $(js_binding_scripts)
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
-
-# We also need the .cpp files, which are generated as side effects of the
-# above rules.  Specifying this explicitly makes -j2 work.
-$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
-
-# HTML tag and attribute names
-GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp
->>>>>>> webkit.org at r54731
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
 $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts)
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 1a75733..5fa0e31 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -18529,13 +18529,10 @@
 				B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */,
 				9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
 				9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */,
-<<<<<<< HEAD
 				59FD5B8D1129B29F00DB6D96 /* GeolocationPositionCache.h in Headers */,
-=======
 				BCE789161120D6080060ECE5 /* InlineIterator.h in Headers */,
 				BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
 				9F6FC1971122E82A00E80196 /* ScriptDebugServer.h in Headers */,
->>>>>>> webkit.org at r54731
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -20714,13 +20711,10 @@
 				84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */,
 				B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */,
 				9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */,
-<<<<<<< HEAD
 				59FD5B8B1129B29100DB6D96 /* GeolocationPositionCache.cpp in Sources */,
-=======
 				BCE7898B1120E8020060ECE5 /* BidiRun.cpp in Sources */,
 				9F6FC1961122E82A00E80196 /* ScriptDebugServer.cpp in Sources */,
 				76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
->>>>>>> webkit.org at r54731
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
index 0199d67..9d6296f 100644
--- a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
@@ -155,13 +155,9 @@ v8::Handle<v8::Value> toV8(Document* impl, bool forceNewObject)
     if (impl->isSVGDocument())
         return toV8(static_cast<SVGDocument*>(impl), forceNewObject);
 #endif
-<<<<<<< HEAD
-    v8::Handle<v8::Value> wrapper = V8Document::wrap(impl, forceNewObject);
-=======
     v8::Handle<v8::Object> wrapper = V8Document::wrap(impl, forceNewObject);
     if (wrapper.IsEmpty())
         return wrapper;
->>>>>>> webkit.org at r54731
     if (!V8IsolatedContext::getEntered()) {
         if (V8Proxy* proxy = V8Proxy::retrieve(impl->frame()))
             proxy->windowShell()->updateDocumentWrapper(wrapper);
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h
index 64b4f02..3045e03 100644
--- a/WebCore/platform/DragImage.h
+++ b/WebCore/platform/DragImage.h
@@ -78,13 +78,10 @@ namespace WebCore {
     typedef GdkPixbuf* DragImageRef;
 #elif PLATFORM(HAIKU)
     typedef BBitmap* DragImageRef;
-<<<<<<< HEAD
-#elif PLATFORM(ANDROID)
-    typedef void* DragImageRef;
-=======
 #elif PLATFORM(BREWMP)
     typedef IImage* DragImageRef;
->>>>>>> webkit.org at r54731
+#elif PLATFORM(ANDROID)
+    typedef void* DragImageRef;
 #endif
     
     IntSize dragImageSize(DragImageRef);
diff --git a/WebCore/platform/graphics/Gradient.cpp b/WebCore/platform/graphics/Gradient.cpp
index 0a751ac..daf4754 100644
--- a/WebCore/platform/graphics/Gradient.cpp
+++ b/WebCore/platform/graphics/Gradient.cpp
@@ -195,13 +195,8 @@ void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTra
     setPlatformGradientSpaceTransform(gradientSpaceTransformation);
 }
 
-<<<<<<< HEAD
 #if !(PLATFORM(SKIA) && !PLATFORM(ANDROID))
-void Gradient::setPlatformGradientSpaceTransform(const TransformationMatrix&)
-=======
-#if !PLATFORM(SKIA)
 void Gradient::setPlatformGradientSpaceTransform(const AffineTransform&)
->>>>>>> webkit.org at r54731
 {
 }
 #endif
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 093ca5a..41e563c 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -382,11 +382,7 @@ public:
 
 private:
 
-<<<<<<< HEAD
-#if defined(XP_UNIX) || PLATFORM(SYMBIAN) || defined(ANDROID_PLUGINS)
-=======
-#if defined(XP_UNIX) || OS(SYMBIAN)
->>>>>>> webkit.org at r54731
+#if defined(XP_UNIX) || OS(SYMBIAN) || defined(ANDROID_PLUGINS)
         void setNPWindowIfNeeded();
 #elif defined(XP_MACOSX)
         NP_CGContext m_npCgContext;
diff --git a/WebKit/chromium/src/AutoFillPopupMenuClient.h b/WebKit/chromium/src/AutoFillPopupMenuClient.h
index fe11334..1912fa3 100644
--- a/WebKit/chromium/src/AutoFillPopupMenuClient.h
+++ b/WebKit/chromium/src/AutoFillPopupMenuClient.h
@@ -63,18 +63,6 @@ private:
     Vector<WebCore::String> m_labels;
 };
 
-<<<<<<< HEAD:WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
-bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
-bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
-bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
-#if PLATFORM(ANDROID)
-// These should default to true, to match the behavior with JSC
-bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
-bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
-#endif
-bool RuntimeEnabledFeatures::isIndexedDatabaseEnabled = false;
-=======
 } // namespace WebKit
->>>>>>> webkit.org at r54731:WebKit/chromium/src/AutoFillPopupMenuClient.h
 
 #endif