resolved conflicts for merge of acf4a21d to master

Change-Id: If8bb4335848f51919608d28a30ee610acb120ae7

1 files changed, 9 insertions, 9 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 5dd0db5..9e1888d 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1174,27 +1174,27 @@ private:
     {
         JNIEnv* env = getJNIEnv();
         // JavaInstance creates a global ref to instance in its constructor.
-        env->DeleteGlobalRef(_instance->instance());
+        env->DeleteGlobalRef(m_instance->instance());
         // Set the object to a weak reference.
-        _instance->setInstance(env->NewWeakGlobalRef(instance));
+        m_instance->setInstance(env->NewWeakGlobalRef(instance));
     }
     ~WeakJavaInstance()
     {
         JNIEnv* env = getJNIEnv();
         // Store the weak reference so we can delete it later.
-        jweak weak = _instance->instance();
+        jweak weak = m_instance->instance();
         // The JavaInstance destructor attempts to delete the global ref stored
-        // in _instance. Since we replaced it in our constructor with a weak
+        // in m_instance. Since we replaced it in our constructor with a weak
         // reference, restore the global ref here so the vm will not complain.
-        _instance->setInstance(env->NewGlobalRef(
-                getRealObject(env, _instance->instance()).get()));
+        m_instance->setInstance(env->NewGlobalRef(
+                getRealObject(env, m_instance->instance()).get()));
         // Delete the weak reference.
         env->DeleteWeakGlobalRef(weak);
     }
 
     virtual void virtualBegin()
     {
-        _weakRef = _instance->instance();
+        _weakRef = m_instance->instance();
         JNIEnv* env = getJNIEnv();
         // This is odd. getRealObject returns an AutoJObject which is used to
         // cleanly create and delete a local reference. But, here we need to
@@ -1203,7 +1203,7 @@ private:
         // and delete the local reference in virtualEnd().
         _realObject = getRealObject(env, _weakRef).release();
         // Point to the real object
-        _instance->setInstance(_realObject);
+        m_instance->setInstance(_realObject);
         // Call the base class method
         INHERITED::virtualBegin();
     }
@@ -1215,7 +1215,7 @@ private:
         // Get rid of the local reference to the real object.
         getJNIEnv()->DeleteLocalRef(_realObject);
         // Point back to the WeakReference.
-        _instance->setInstance(_weakRef);
+        m_instance->setInstance(_weakRef);
     }
 
 private: