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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 1d653b95e1c0f315cf54b1e23639869d152a46c0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 21 22:27:09 2004 +0000

    WebCore:
            Removed _bindObject:forFrame: SPI.
    
            Reviewed by Chris.
    
            * kwq/KWQKHTMLPart.h:
            * kwq/KWQKHTMLPart.mm:
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
    
    WebKit:
            Removed _bindObject:forFrame: SPI.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebView.m:
            * WebView.subproj/WebViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 09f3615..bffda26 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-05-21  Richard Williamson   <rjw at apple.com>
+
+        Removed _bindObject:forFrame: SPI.
+        
+        Reviewed by Chris.
+
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+
 2004-05-21  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3663644, repaints don't occur when the .innerHTML of a positioned element is changed.
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index f9c081a..b2382c1 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -290,7 +290,6 @@ public:
     KJS::Bindings::RootObject *bindingRootObject();
     
     WebScriptObject *windowScriptObject();
-    void bindObject(void *object, QString name);
     
     void partClearedInBegin();
     
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 22b1676..9933a0b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1158,14 +1158,6 @@ WebScriptObject *KWQKHTMLPart::windowScriptObject()
     return _windowScriptObject;
 }
 
-void KWQKHTMLPart::bindObject(void *object, QString name)
-{
-    if (d->m_doc && jScript()) {
-        Window *w = Window::retrieveWindow(this);
-        w->put(jScript()->interpreter()->globalExec(), KJS::Identifier(name), Instance::createRuntimeObject(Instance::ObjectiveCLanguage, (void *)object));
-    }
-}
-
 void KWQKHTMLPart::partClearedInBegin()
 {
     [_bridge windowObjectCleared];
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ae7309c..b2ec943 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -297,7 +297,6 @@ typedef enum {
 - (void)ensureCaretVisible;
 
 - (WebScriptObject *)windowScriptObject;
-- (void)bindObject:(id)object withName:(NSString *)name;
 
 @end
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 446c909..34fffd2 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1091,14 +1091,6 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
     return _part->windowScriptObject();
 }
 
-- (void)bindObject:(id)object withName:(NSString *)name
-{
-    // Create an empty document, if necessary.  
-    _part->createEmptyDocument();
-    
-    _part->bindObject((void *)object, QString::fromNSString(name));
-}
-
 - (DOMDocument *)DOMDocument
 {
     return [DOMDocument _documentWithImpl:_part->xmlDocImpl()];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f70bc3c..6ce27b6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-21  Richard Williamson   <rjw at apple.com>
+
+        Removed _bindObject:forFrame: SPI.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebView.m:
+        * WebView.subproj/WebViewPrivate.h:
+
 === Safari-141 ===
 
 2004-05-21  Darin Adler  <darin at apple.com>
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 38e9838..e640b40 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -3312,14 +3312,3 @@ static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
 }
 
 @end
-
- at implementation WebView (JavaScriptBinding)
-- (void)_bindObject:(id)object withName:(NSString *)name toFrame:(WebFrame *)frame
-{
-    if (!frame)
-        [[[self mainFrame] _bridge] bindObject:object withName:name];
-    else {
-        [[frame _bridge] bindObject:object withName:name];
-    }
-}
- at end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 39be761..52fdd39 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -316,17 +316,3 @@ Could be worth adding to the API.
 - (BOOL)_shouldEndEditingInDOMRange:(DOMRange *)range;
 @end
 
-
- at interface WebView (JavaScriptBinding)
-/*!
-    @method _bindObject:withName:toDocumentInFrame:
-    @discussion Expose the methods and instance variables of object to JavaScript.
-    @param object The object to be bound to JavaScript.
-    @param name The name of the property in JavaScript that is used to access the bound object.
-    @param frame If the frame is nil the object is bound to the main frame of the WebView.  The object
-    is added as a property of the window (which is the global object).
-*/
-- (void)_bindObject:(id)object withName:(NSString *)name toFrame:(WebFrame *)frame;
- at end
-
-

-- 
WebKit Debian packaging