summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/objc
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-20 11:42:04 +0000
committerSteve Block <steveblock@google.com>2010-01-20 12:03:31 +0000
commit16885d427ad88d2062898f56b801491974b88201 (patch)
tree0ad642993fa0310f5180ff5e71f94ccbf0074bf6 /WebCore/bridge/objc
parent9d25b5789c947f3974b7a4f722240ae95cad733e (diff)
downloadexternal_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/objc')
-rw-r--r--WebCore/bridge/objc/objc_instance.mm6
-rw-r--r--WebCore/bridge/objc/objc_runtime.mm2
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/bridge/objc/objc_instance.mm b/WebCore/bridge/objc/objc_instance.mm
index 9f2e3bb..25da8b9 100644
--- a/WebCore/bridge/objc/objc_instance.mm
+++ b/WebCore/bridge/objc/objc_instance.mm
@@ -277,7 +277,7 @@ JSValue ObjcInstance::invokeMethod(ExecState* exec, const MethodList &methodList
if (*type != 'v') {
[invocation getReturnValue:buffer];
- result = convertObjcValueToValue(exec, buffer, objcValueType, _rootObject.get());
+ result = convertObjcValueToValue(exec, buffer, objcValueType, m_rootObject.get());
}
} @catch(NSException* localException) {
}
@@ -329,7 +329,7 @@ JSValue ObjcInstance::invokeDefaultMethod(ExecState* exec, const ArgList &args)
// OK with 32 here.
char buffer[32];
[invocation getReturnValue:buffer];
- result = convertObjcValueToValue(exec, buffer, objcValueType, _rootObject.get());
+ result = convertObjcValueToValue(exec, buffer, objcValueType, m_rootObject.get());
} @catch(NSException* localException) {
}
moveGlobalExceptionToExecState(exec);
@@ -383,7 +383,7 @@ JSValue ObjcInstance::getValueOfUndefinedField(ExecState* exec, const Identifier
@try {
id objcValue = [targetObject valueForUndefinedKey:[NSString stringWithCString:property.ascii() encoding:NSASCIIStringEncoding]];
- result = convertObjcValueToValue(exec, &objcValue, ObjcObjectType, _rootObject.get());
+ result = convertObjcValueToValue(exec, &objcValue, ObjcObjectType, m_rootObject.get());
} @catch(NSException* localException) {
// Do nothing. Class did not override valueForUndefinedKey:.
}
diff --git a/WebCore/bridge/objc/objc_runtime.mm b/WebCore/bridge/objc/objc_runtime.mm
index 5efc865..772695c 100644
--- a/WebCore/bridge/objc/objc_runtime.mm
+++ b/WebCore/bridge/objc/objc_runtime.mm
@@ -174,7 +174,7 @@ JSValue ObjcArray::valueAt(ExecState* exec, unsigned int index) const
@try {
id obj = [_array.get() objectAtIndex:index];
if (obj)
- return convertObjcValueToValue (exec, &obj, ObjcObjectType, _rootObject.get());
+ return convertObjcValueToValue (exec, &obj, ObjcObjectType, m_rootObject.get());
} @catch(NSException* localException) {
return throwError(exec, GeneralError, "Objective-C exception.");
}