diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/bridge | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/bridge')
| -rw-r--r-- | WebCore/bridge/npapi.h | 8 | ||||
| -rw-r--r-- | WebCore/bridge/objc/objc_instance.mm | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index 7e590ff..b1e8fcd 100644 --- a/WebCore/bridge/npapi.h +++ b/WebCore/bridge/npapi.h @@ -381,6 +381,7 @@ typedef enum { , NPPVpluginCoreAnimationLayer = 1003 #endif +<<<<<<< HEAD #ifdef ANDROID /* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser * to wait a certain amount of millis before calling NPN_WriteReady again. @@ -392,6 +393,9 @@ typedef enum { #endif #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5) +======= +#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) +>>>>>>> webkit.org at r68651 , NPPVpluginWindowlessLocalBool = 2002 #endif } NPPVariable; @@ -437,12 +441,16 @@ typedef enum { #endif , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */ #endif /* XP_MACOSX */ +<<<<<<< HEAD #ifdef ANDROID , NPNFakeValueToForce32Bits = 0x7FFFFFFF #endif #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5) +======= +#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) +>>>>>>> webkit.org at r68651 , NPNVSupportsWindowlessLocal = 2002 #endif } NPNVariable; diff --git a/WebCore/bridge/objc/objc_instance.mm b/WebCore/bridge/objc/objc_instance.mm index 6c56458..989d9eb 100644 --- a/WebCore/bridge/objc/objc_instance.mm +++ b/WebCore/bridge/objc/objc_instance.mm @@ -27,7 +27,6 @@ #import "objc_instance.h" #import "runtime_method.h" -#import "FoundationExtras.h" #import "ObjCRuntimeObject.h" #import "WebScriptObject.h" #import <objc/objc-auto.h> @@ -70,9 +69,9 @@ RuntimeObject* ObjcInstance::newRuntimeObject(ExecState* exec) void ObjcInstance::setGlobalException(NSString* exception, JSGlobalObject* exceptionEnvironment) { - HardRelease(s_exception); - HardRetain(exception); - s_exception = exception; + NSString *oldException = s_exception; + s_exception = [exception copy]; + [oldException release]; s_exceptionEnvironment = exceptionEnvironment; } @@ -89,9 +88,8 @@ void ObjcInstance::moveGlobalExceptionToExecState(ExecState* exec) throwError(exec, s_exception); } - HardRelease(s_exception); - s_exception = 0; - + [s_exception release]; + s_exception = nil; s_exceptionEnvironment = 0; } |