Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm b/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm
index a44ce2334..f1eebd355 100644
--- a/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm
+++ b/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm
@@ -55,7 +55,7 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
 
 @interface WebScriptCallFrame (WebScriptDebugDelegateInternal)
 
-- (id)_convertValueToObjcValue:(JSValue)value;
+- (id)_convertValueToObjcValue:(JSC::JSValue)value;
 
 @end
 
@@ -113,7 +113,7 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
     _private->debuggerCallFrame = 0;
 }
 
-- (id)_convertValueToObjcValue:(JSValue)value
+- (id)_convertValueToObjcValue:(JSC::JSValue)value
 {
     if (!value)
         return nil;
@@ -176,7 +176,7 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
 
 
     JSScope* scope = _private->debuggerCallFrame->scope();
-    JSLockHolder lock(scope->globalData());
+    JSLockHolder lock(scope->vm());
     if (!scope->next())  // global frame
         return [NSArray arrayWithObject:_private->globalObject];
 
@@ -186,7 +186,7 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
     for (ScopeChainIterator it = scope->begin(); it != end; ++it) {
         JSObject* object = it.get();
         if (object->isActivationObject())
-            object = DebuggerActivation::create(*scope->globalData(), object);
+            object = DebuggerActivation::create(*scope->vm(), object);
         [scopes addObject:[self _convertValueToObjcValue:object]];
     }
 
@@ -214,7 +214,7 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
     if (!_private->debuggerCallFrame)
         return nil;
 
-    JSValue exception = _private->debuggerCallFrame->exception();
+    JSC::JSValue exception = _private->debuggerCallFrame->exception();
     return exception ? [self _convertValueToObjcValue:exception] : nil;
 }
 
@@ -234,22 +234,22 @@ NSString * const WebScriptErrorLineNumberKey = @"WebScriptErrorLineNumber";
     // WebScriptCallFrame. Instead, we need to set the dynamic global object
     // and evaluate the JS in the global object's global call frame.
     JSGlobalObject* globalObject = _private->debugger->globalObject();
-    JSLockHolder lock(globalObject->globalData());
+    JSLockHolder lock(globalObject->vm());
 
-    if (self == _private->debugger->globalCallFrame() && !globalObject->globalData().dynamicGlobalObject) {
+    if (self == _private->debugger->globalCallFrame() && !globalObject->vm().dynamicGlobalObject) {
         JSGlobalObject* globalObject = _private->debugger->globalObject();
 
-        DynamicGlobalObjectScope globalObjectScope(globalObject->globalData(), globalObject);
+        DynamicGlobalObjectScope globalObjectScope(globalObject->vm(), globalObject);
 
-        JSValue exception;
-        JSValue result = evaluateInGlobalCallFrame(script, exception, globalObject);
+        JSC::JSValue exception;
+        JSC::JSValue result = evaluateInGlobalCallFrame(script, exception, globalObject);
         if (exception)
             return [self _convertValueToObjcValue:exception];
         return result ? [self _convertValueToObjcValue:result] : nil;        
     }
 
-    JSValue exception;
-    JSValue result = _private->debuggerCallFrame->evaluate(script, exception);
+    JSC::JSValue exception;
+    JSC::JSValue result = _private->debuggerCallFrame->evaluate(script, exception);
     if (exception)
         return [self _convertValueToObjcValue:exception];
     return result ? [self _convertValueToObjcValue:result] : nil;