Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridge

Keep ours for generic bridge code as this is a work in progress.
Take theirs for conflicts on other platforms due to bridge changes.
Take theirs for updates for recently moved JSC JNI bridge.

Change-Id: I7db68450a369bb652755cc4b9555083c76b07510

diff --git a/WebCore/bridge/Bridge.h b/WebCore/bridge/Bridge.h
index e3155df..50efc64 100644 (file)
--- a/WebCore/bridge/Bridge.h
+++ b/WebCore/bridge/Bridge.h
@@ -28,10 +28,7 @@
 #define Bridge_h
 
 #include "BridgeJSC.h"
-<<<<<<< HEAD
 #include <wtf/Noncopyable.h>
-=======
->>>>>>> webkit.org at r54127
 
 namespace JSC  {
 

diff --git a/WebCore/bridge/jni/JNIBridge.cpp b/WebCore/bridge/jni/JNIBridge.cpp
index 008b3d3..3329ba8 100644 (file)
--- a/WebCore/bridge/jni/JNIBridge.cpp
+++ b/WebCore/bridge/jni/JNIBridge.cpp
@@ -55,14 +55,6 @@ JavaParameter::JavaParameter(JNIEnv* env, jstring type)
 
 JavaMethod::JavaMethod(JNIEnv* env, jobject aMethod)
 {
-<<<<<<< HEAD
-    // Get return type
-    jobject returnType = callJNIMethod<jobject>(aMethod, "getReturnType", "()Ljava/lang/Class;");
-    jstring returnTypeName = static_cast<jstring>(callJNIMethod<jobject>(returnType, "getName", "()Ljava/lang/String;"));
-    m_returnType = JavaString(env, returnTypeName);
-    m_JNIReturnType = JNITypeFromClassName(m_returnType.UTF8String());
-    env->DeleteLocalRef(returnType);
-=======
     // Get return type name
     jstring returnTypeName = 0;
     if (jobject returnType = callJNIMethod<jobject>(aMethod, "getReturnType", "()Ljava/lang/Class;")) {
@@ -73,34 +65,16 @@ JavaMethod::JavaMethod(JNIEnv* env, jobject aMethod)
     }
     m_returnType = JavaString(env, returnTypeName);
     m_JNIReturnType = JNITypeFromClassName(m_returnType.UTF8String());
->>>>>>> webkit.org at r54127
     env->DeleteLocalRef(returnTypeName);
 
     // Get method name
     jstring methodName = static_cast<jstring>(callJNIMethod<jobject>(aMethod, "getName", "()Ljava/lang/String;"));
-<<<<<<< HEAD
-=======
     if (!returnTypeName)
         returnTypeName = env->NewStringUTF("<Unknown>");
->>>>>>> webkit.org at r54127
     m_name = JavaString(env, methodName);
     env->DeleteLocalRef(methodName);
 
     // Get parameters
-<<<<<<< HEAD
-    jarray jparameters = static_cast<jarray>(callJNIMethod<jobject>(aMethod, "getParameterTypes", "()[Ljava/lang/Class;"));
-    m_numParameters = env->GetArrayLength(jparameters);
-    m_parameters = new JavaParameter[m_numParameters];
-
-    for (int i = 0; i < m_numParameters; i++) {
-        jobject aParameter = env->GetObjectArrayElement(static_cast<jobjectArray>(jparameters), i);
-        jstring parameterName = static_cast<jstring>(callJNIMethod<jobject>(aParameter, "getName", "()Ljava/lang/String;"));
-        m_parameters[i] = JavaParameter(env, parameterName);
-        env->DeleteLocalRef(aParameter);
-        env->DeleteLocalRef(parameterName);
-    }
-    env->DeleteLocalRef(jparameters);
-=======
     if (jarray jparameters = static_cast<jarray>(callJNIMethod<jobject>(aMethod, "getParameterTypes", "()[Ljava/lang/Class;"))) {
         m_numParameters = env->GetArrayLength(jparameters);
         m_parameters = new JavaParameter[m_numParameters];
@@ -119,7 +93,6 @@ JavaMethod::JavaMethod(JNIEnv* env, jobject aMethod)
         m_numParameters = 0;
         m_parameters = 0;
     }
->>>>>>> webkit.org at r54127
 
     // Created lazily.
     m_signature = 0;

diff --git a/WebCore/bridge/jni/JNIBridge.h b/WebCore/bridge/jni/JNIBridge.h
index c9d3a24..5d482a7 100644 (file)
--- a/WebCore/bridge/jni/JNIBridge.h
+++ b/WebCore/bridge/jni/JNIBridge.h
@@ -29,19 +29,13 @@
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
-<<<<<<< HEAD
 #include "Bridge.h"
-=======
->>>>>>> webkit.org at r54127
 #include "JNIUtility.h"
 
 #if USE(JSC)
 #include "JavaStringJSC.h"
-<<<<<<< HEAD
 #elif USE(V8)
 #include "JavaStringV8.h"
-=======
->>>>>>> webkit.org at r54127
 #endif
 
 namespace JSC {

diff --git a/WebCore/bridge/jni/jsc/JNIBridgeJSC.cpp b/WebCore/bridge/jni/jsc/JNIBridgeJSC.cpp
index 4520bd6..4e1b0d2 100644 (file)
--- a/WebCore/bridge/jni/jsc/JNIBridgeJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JNIBridgeJSC.cpp
@@ -49,12 +49,6 @@ using namespace JSC::Bindings;
 
 JavaField::JavaField(JNIEnv* env, jobject aField)
 {
-<<<<<<< HEAD
-    // Get field type
-    jobject fieldType = callJNIMethod<jobject>(aField, "getType", "()Ljava/lang/Class;");
-    jstring fieldTypeName = static_cast<jstring>(callJNIMethod<jobject>(fieldType, "getName", "()Ljava/lang/String;"));
-    m_type = JavaString(env, fieldTypeName);
-=======
     // Get field type name
     jstring fieldTypeName = 0;
     if (jobject fieldType = callJNIMethod<jobject>(aField, "getType", "()Ljava/lang/Class;"))
@@ -63,16 +57,12 @@ JavaField::JavaField(JNIEnv* env, jobject aField)
         fieldTypeName = env->NewStringUTF("<Unknown>");
     m_type = JavaString(env, fieldTypeName);
 
->>>>>>> webkit.org at r54127
     m_JNIType = JNITypeFromClassName(m_type.UTF8String());
 
     // Get field name
     jstring fieldName = static_cast<jstring>(callJNIMethod<jobject>(aField, "getName", "()Ljava/lang/String;"));
-<<<<<<< HEAD
-=======
     if (!fieldName)
         fieldName = env->NewStringUTF("<Unknown>");
->>>>>>> webkit.org at r54127
     m_name = JavaString(env, fieldName);
 
     m_field = new JObjectWrapper(aField);

diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
index a0e6db5..b42456c 100644 (file)
--- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
@@ -90,14 +90,11 @@ JSValue JavaInstance::stringValue(ExecState* exec) const
     JSLock lock(SilenceAssertionsOnly);
 
     jstring stringValue = (jstring)callJNIMethod<jobject>(m_instance->m_instance, "toString", "()Ljava/lang/String;");
-<<<<<<< HEAD
-=======
 
     // Should throw a JS exception, rather than returning ""? - but better than a null dereference.
     if (!stringValue)
         return jsString(exec, UString());
 
->>>>>>> webkit.org at r54127
     JNIEnv* env = getJNIEnv();
     const jchar* c = getUCharactersFromJStringInEnv(env, stringValue);
     UString u((const UChar*)c, (int)env->GetStringLength(stringValue));
@@ -126,11 +123,7 @@ JSValue JavaInstance::invokeMethod(ExecState* exec, const MethodList& methodList
     size_t numMethods = methodList.size();
 
     // Try to find a good match for the overloaded method.  The
-<<<<<<< HEAD
     // fundamental problem is that JavaScript doesn't have the
-=======
-    // fundamental problem is that JavaScript doesn have the
->>>>>>> webkit.org at r54127
     // notion of method overloading and Java does.  We could
     // get a bit more sophisticated and attempt to does some
     // type checking as we as checking the number of parameters.

diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index ebdf4d4..b0dca80 100644 (file)
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -28,10 +28,7 @@
 #include "PluginView.h"
 
 #include "Bridge.h"
-<<<<<<< HEAD
-=======
 #include "Chrome.h"
->>>>>>> webkit.org at r54127
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Element.h"

diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h
index 138a316..6e8ac47 100644 (file)
--- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h
+++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h
@@ -28,18 +28,11 @@
 #ifndef ProxyInstance_h
 #define ProxyInstance_h
 
-<<<<<<< HEAD
-#include <WebCore/Bridge.h>
-#include <WebCore/runtime_root.h>
-#include <wtf/OwnPtr.h>
-#include "WebKitPluginHostTypes.h"
-=======
 #import "NetscapePluginInstanceProxy.h"
 #import "WebKitPluginHostTypes.h"
 #import <WebCore/Bridge.h>
 #import <WebCore/runtime_root.h>
 #import <wtf/OwnPtr.h>
->>>>>>> webkit.org at r54127
 
 namespace WebKit {