[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 6f982fdf28868d3efaa0bb7a5b67048422fc0be2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 18 22:00:47 2002 +0000

    WebCore:
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
    	Changed to return a string and changed name.
    
    WebKit:
    
            * WebView.subproj/WebController.h:
            * WebView.subproj/WebController.m:
            (-[WebController stringByEvaluatingJavaScriptFromString:]):
    	Changed to return a string and changed name.
    
    WebBrowser:
    
            * BrowserWebBookmarkExtras.m: (-[WebBookmark _goToWithWindowPolicy:]):
            * BrowserWindowController.m: (-[BrowserWindowController goToToolbarLocation:]):
    	Update to call stringByEvaluatingJavaScriptFromString.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e60a3a2..710e2dd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-18  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
+	Changed to return a string and changed name.
+
 2002-10-18  David Hyatt  <hyatt at apple.com>
 
 	The collapsing margin rewrite. Also fixes a bug where
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e60a3a2..710e2dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-10-18  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
+	Changed to return a string and changed name.
+
 2002-10-18  David Hyatt  <hyatt at apple.com>
 
 	The collapsing margin rewrite. Also fixes a bug where
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e60a3a2..710e2dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-10-18  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge stringByEvaluatingJavaScriptFromString:]):
+	Changed to return a string and changed name.
+
 2002-10-18  David Hyatt  <hyatt at apple.com>
 
 	The collapsing margin rewrite. Also fixes a bug where
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 0234497..b7a168d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -143,7 +143,7 @@ enum FrameBorderStyle {
 
 - (CFStringEncoding)textEncoding;
 
-- (void)executeJavaScriptFromString:(NSString *)string;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string;
 
 - (id <WebDOMDocument>)DOMDocument;
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 80be87a..b3a7478 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -540,12 +540,13 @@ using khtml::RenderPart;
     return part->impl->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
 }
 
-- (void)executeJavaScriptFromString:(NSString *)string
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string
 {
     // FIXME: We want to execute it even without a document, no?
-    if (part->impl->document()) {
-        part->executeScript(QString::fromNSString(string));
+    if (!part->impl->document()) {
+        return nil;
     }
+    return part->executeScript(QString::fromNSString(string)).asString().getNSString();
 }
 
 - (id<WebDOMDocument>)DOMDocument
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6ae1456..93eb37f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-10-18  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebController.h:
+        * WebView.subproj/WebController.m:
+        (-[WebController stringByEvaluatingJavaScriptFromString:]):
+	Changed to return a string and changed name.
+
+2002-10-18  Darin Adler  <darin at apple.com>
+
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
 
 2002-10-18  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6ae1456..93eb37f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-18  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebController.h:
+        * WebView.subproj/WebController.m:
+        (-[WebController stringByEvaluatingJavaScriptFromString:]):
+	Changed to return a string and changed name.
+
+2002-10-18  Darin Adler  <darin at apple.com>
+
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
 
 2002-10-18  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 618a944..e2cee58 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -368,9 +368,10 @@ extern NSString *WebElementFrameKey;
 - (NSString *)customTextEncodingName;
 
 /*!
-    @method executeJavaScriptFromString:
+    @method stringByEvaluatingJavaScriptFromString:
     @param script The text of the JavaScript.
+    @result Returns the result of the script, converted to a string, or nil for failure.
 */
-- (void)executeJavaScriptFromString:(NSString *)string;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
 
 @end
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 3c38aa4..cc2cd54 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -457,9 +457,9 @@ NSString *WebElementFrameKey = @"WebElementFrame";
     return result;
 }
 
-- (void)executeJavaScriptFromString:(NSString *)string
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script
 {
-    [[[self mainFrame] _bridge] executeJavaScriptFromString:string];
+    return [[[self mainFrame] _bridge] stringByEvaluatingJavaScriptFromString:script];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 618a944..e2cee58 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -368,9 +368,10 @@ extern NSString *WebElementFrameKey;
 - (NSString *)customTextEncodingName;
 
 /*!
-    @method executeJavaScriptFromString:
+    @method stringByEvaluatingJavaScriptFromString:
     @param script The text of the JavaScript.
+    @result Returns the result of the script, converted to a string, or nil for failure.
 */
-- (void)executeJavaScriptFromString:(NSString *)string;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
 
 @end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 3c38aa4..cc2cd54 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -457,9 +457,9 @@ NSString *WebElementFrameKey = @"WebElementFrame";
     return result;
 }
 
-- (void)executeJavaScriptFromString:(NSString *)string
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script
 {
-    [[[self mainFrame] _bridge] executeJavaScriptFromString:string];
+    return [[[self mainFrame] _bridge] stringByEvaluatingJavaScriptFromString:script];
 }
 
 @end

-- 
WebKit Debian packaging