[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[ajwong at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit be912bf0f06d1cd2bf6d6fe6fa138d76c1aa0bb5
Author: ajwong at chromium.org <ajwong at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 01:55:17 2009 +0000

    Not reviewed: Chromium build fix.
    
    Fix Chromium build break caused by an added dependency from
    	ScriptControllerBase to JSDOMWindowShell, and an API change in
    	ScriptValue.
    
    * bindings/ScriptControllerBase.cpp:
    (WebCore::ScriptController::executeIfJavaScriptURL):
    * bindings/v8/ScriptValue.h:
    (WebCore::ScriptValue::getString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b5e0c81..d91768c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-07  Albert J. Wong  <ajwong at chromium.org>
+
+        Not reviewed: Chromium build fix.
+
+        Fix Chromium build break caused by an added dependency from
+        ScriptControllerBase to JSDOMWindowShell, and an API change in
+        ScriptValue.
+
+        * bindings/ScriptControllerBase.cpp:
+        (WebCore::ScriptController::executeIfJavaScriptURL):
+        * bindings/v8/ScriptValue.h:
+        (WebCore::ScriptValue::getString):
+
 2009-12-07  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/ScriptControllerBase.cpp b/WebCore/bindings/ScriptControllerBase.cpp
index 71adda7..72c9f45 100644
--- a/WebCore/bindings/ScriptControllerBase.cpp
+++ b/WebCore/bindings/ScriptControllerBase.cpp
@@ -73,10 +73,15 @@ bool ScriptController::executeIfJavaScriptURL(const KURL& url, bool userGesture,
         result = executeScript(script, userGesture);
 
     String scriptResult;
+#if USE(JSC)
     JSDOMWindowShell* shell = windowShell(mainThreadNormalWorld());
     JSC::ExecState* exec = shell->window()->globalExec();
     if (!result.getString(exec, scriptResult))
         return true;
+#else
+    if (!result.getString(scriptResult))
+        return true;
+#endif
 
     // FIXME: We should always replace the document, but doing so
     //        synchronously can cause crashes:
diff --git a/WebCore/bindings/v8/ScriptValue.h b/WebCore/bindings/v8/ScriptValue.h
index 452a4fd..74b06ca 100644
--- a/WebCore/bindings/v8/ScriptValue.h
+++ b/WebCore/bindings/v8/ScriptValue.h
@@ -144,6 +144,7 @@ public:
     }
 
     v8::Handle<v8::Value> v8Value() const { return m_value; }
+    bool getString(ScriptState*, String& result) const { getString(result); }
     bool getString(String& result) const;
     String toString(ScriptState*) const;
 

-- 
WebKit Debian packaging