diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 11:42:04 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-20 12:03:31 +0000 |
| commit | 16885d427ad88d2062898f56b801491974b88201 (patch) | |
| tree | 0ad642993fa0310f5180ff5e71f94ccbf0074bf6 /WebCore/bridge/jni/jni_runtime.cpp | |
| parent | 9d25b5789c947f3974b7a4f722240ae95cad733e (diff) | |
| download | external_webkit-16885d427ad88d2062898f56b801491974b88201.zip external_webkit-16885d427ad88d2062898f56b801491974b88201.tar.gz external_webkit-16885d427ad88d2062898f56b801491974b88201.tar.bz2 | |
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53541
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Change-Id: Ifa112a8700149b21a1a1bbdf8366844adb3a9ae6
Diffstat (limited to 'WebCore/bridge/jni/jni_runtime.cpp')
| -rw-r--r-- | WebCore/bridge/jni/jni_runtime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/jni_runtime.cpp index d77048d..3624ba5 100644 --- a/WebCore/bridge/jni/jni_runtime.cpp +++ b/WebCore/bridge/jni/jni_runtime.cpp @@ -379,7 +379,7 @@ JavaArray::JavaArray(jobject array, const char* type, PassRefPtr<RootObject> roo JNIEnv *env = getJNIEnv(); _length = env->GetArrayLength((jarray)_array->m_instance); _type = strdup(type); - _rootObject = rootObject; + m_rootObject = rootObject; } JavaArray::~JavaArray () @@ -389,7 +389,7 @@ JavaArray::~JavaArray () RootObject* JavaArray::rootObject() const { - return _rootObject && _rootObject->isValid() ? _rootObject.get() : 0; + return m_rootObject && m_rootObject->isValid() ? m_rootObject.get() : 0; } void JavaArray::setValueAt(ExecState* exec, unsigned index, JSValue aValue) const |