[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 0b9fb5901260df96c08e9bd2bc393381927ecdc0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 18 03:56:28 2003 +0000

    Fixed build problem resulting from addition of KJS to Bindings namespace.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5829 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4b128d1..5b0d5c0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-12-17  Richard Williamson   <rjw at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLAppletElementImpl::getAppletInstance):
+        * khtml/html/html_objectimpl.h:
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::getAppletInstanceForView):
+        (KWQKHTMLPart::addPluginRootObject):
+        (KWQKHTMLPart::cleanupPluginRootObjects):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge init]):
+
 2003-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 8ad2817..c1005b6 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -174,7 +174,7 @@ bool HTMLAppletElementImpl::callMember(const QString & name, const QStringList &
 }
 
 #if APPLE_CHANGES
-Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
+KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
 {
     if (appletInstance)
         return appletInstance;
diff --git a/WebCore/khtml/html/html_objectimpl.h b/WebCore/khtml/html/html_objectimpl.h
index 738daf3..230f73c 100644
--- a/WebCore/khtml/html/html_objectimpl.h
+++ b/WebCore/khtml/html/html_objectimpl.h
@@ -60,14 +60,14 @@ public:
     
 #if APPLE_CHANGES
     void setupApplet() const;
-    Bindings::Instance *getAppletInstance() const;
+    KJS::Bindings::Instance *getAppletInstance() const;
 #endif
 
 protected:
     khtml::VAlign valign;
 
 private:
-    mutable Bindings::Instance *appletInstance;
+    mutable KJS::Bindings::Instance *appletInstance;
 };
 
 // -------------------------------------------------------------------------
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index cdc297f..a38a3c2 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -253,8 +253,8 @@ public:
     bool haveToldBridgeAboutLoad(const QString &urlString);
     void print();
 
-    Bindings::Instance *getAppletInstanceForView (NSView *aView);
-    void addPluginRootObject(const Bindings::RootObject *root);
+    KJS::Bindings::Instance *getAppletInstanceForView (NSView *aView);
+    void addPluginRootObject(const KJS::Bindings::RootObject *root);
     void cleanupPluginRootObjects();
     
 private:
@@ -309,7 +309,7 @@ private:
 
     friend class KHTMLPart;
 
-    QPtrList<Bindings::RootObject> rootObjects;
+    QPtrList<KJS::Bindings::RootObject> rootObjects;
 };
 
 inline KWQKHTMLPart *KWQ(KHTMLPart *part) { return static_cast<KWQKHTMLPart *>(part); }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ca2ec43..731b15d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2762,7 +2762,7 @@ void KWQKHTMLPart::print()
     [_bridge print];
 }
 
-Bindings::Instance *KWQKHTMLPart::getAppletInstanceForView (NSView *aView)
+KJS::Bindings::Instance *KWQKHTMLPart::getAppletInstanceForView (NSView *aView)
 {
     // Get a pointer to the actual Java applet instance.
     jobject applet = [_bridge pollForAppletInView:aView];
@@ -2770,21 +2770,21 @@ Bindings::Instance *KWQKHTMLPart::getAppletInstanceForView (NSView *aView)
     if (applet)
         // Wrap the Java instance in a language neutral binding and hand
         // off ownership to the APPLET element.
-        return Bindings::Instance::createBindingForLanguageInstance (Bindings::Instance::JavaLanguage, applet);
+        return KJS::Bindings::Instance::createBindingForLanguageInstance (KJS::Bindings::Instance::JavaLanguage, applet);
     
     return 0;
 }
 
-void KWQKHTMLPart::addPluginRootObject(const Bindings::RootObject *root)
+void KWQKHTMLPart::addPluginRootObject(const KJS::Bindings::RootObject *root)
 {
     rootObjects.append (root);
 }
 
 void KWQKHTMLPart::cleanupPluginRootObjects()
 {
-    Bindings::RootObject *root;
+    KJS::Bindings::RootObject *root;
     while ((root = rootObjects.getLast())) {
-        Bindings::RootObject::removeAllJavaReferencesForRoot (root);
+        KJS::Bindings::RootObject::removeAllJavaReferencesForRoot (root);
         rootObjects.removeLast();
     }
 }
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 3492df2..b46e476 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -88,7 +88,7 @@ using KJS::SavedBuiltins;
 
 using KParts::URLArgs;
 
-using Bindings::RootObject;
+using KJS::Bindings::RootObject;
 
 NSString *WebCoreElementFrameKey = 		@"WebElementFrame";
 NSString *WebCoreElementImageAltStringKey = 	@"WebElementImageAltString";
@@ -140,7 +140,7 @@ static bool initializedKJS = FALSE;
     }
     
     if (!initializedKJS) {
-        Bindings::RootObject::setFindRootObjectForNativeHandleFunction (rootForView);
+        KJS::Bindings::RootObject::setFindRootObjectForNativeHandleFunction (rootForView);
         initializedKJS = TRUE;
     }
     

-- 
WebKit Debian packaging