diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 04:45:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 04:45:38 -0800 |
| commit | d9b562d65e56e563079a5a7778a41c98aa6cf1b5 (patch) | |
| tree | 088c5e95997833029ae9bf02f28cf998242dd04e /WebCore/bridge/jni/jni_runtime.cpp | |
| parent | 0cfc2e19eeb90d6897b190b056e192bc1afd5c44 (diff) | |
| parent | 032a9065415ac4791c8d73bceba10cfa9fc77bf7 (diff) | |
| download | external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.zip external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.tar.gz external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.tar.bz2 | |
am 032a9065: Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
Merge commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7' into eclair-mr2-plus-aosp
* commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7':
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
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 |