diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 04:42:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-20 04:42:42 -0800 |
| commit | 032a9065415ac4791c8d73bceba10cfa9fc77bf7 (patch) | |
| tree | 088c5e95997833029ae9bf02f28cf998242dd04e /WebCore/bridge/jni/jni_runtime.cpp | |
| parent | 315ee382f1ca39ab4f263f7e0c25172942fc054c (diff) | |
| parent | 16885d427ad88d2062898f56b801491974b88201 (diff) | |
| download | external_webkit-032a9065415ac4791c8d73bceba10cfa9fc77bf7.zip external_webkit-032a9065415ac4791c8d73bceba10cfa9fc77bf7.tar.gz external_webkit-032a9065415ac4791c8d73bceba10cfa9fc77bf7.tar.bz2 | |
Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
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 |