Cherry-pick WebKit change 53436 to fix style in JavaInstanceJSC

See http://trac.webkit.org/changeset/53436
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Note that changes to the following were required as a result of this cherry-pick.
- WebCoreFrameBridge.cpp - updated to use JavaInstance::m_instance
- V8Binding/jni/jni_instance - Updated to rename the V8 version of JavaInstance::_instance to JavaInstance::m_instance
  to allow the same code path to be used in WebCoreFrameBridge.

Change-Id: I6884f7424c8a0917095f828bda4ca62452e527b5

1 files changed, 5 insertions, 5 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 14d26f9..567fb6f 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1222,14 +1222,14 @@ 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 our WeakReference wrapper.
-        _instance->setInstance(adoptGlobalRef(env, instance));
+        m_instance->setInstance(adoptGlobalRef(env, instance));
     }
 
     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
@@ -1238,7 +1238,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();
     }
@@ -1250,7 +1250,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: