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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit f97cbe36997241b60de6ddbca907365c17a4eadb
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 24 23:08:27 2002 +0000

    *** empty log message ***
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e141de9..a4bf0cf 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-24  Chris Blumenberg  <cblu at apple.com>
+
+	Changed the plug-in view constructor to take NSURL's rather
+	than URL strings.	
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::requestObject):
+        * kwq/WebCoreViewFactory.h:
+        * kwq/WebCoreViewFactory.m:
+
 2002-06-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Put APPLE_CHANGES
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e141de9..a4bf0cf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-06-24  Chris Blumenberg  <cblu at apple.com>
+
+	Changed the plug-in view constructor to take NSURL's rather
+	than URL strings.	
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::requestObject):
+        * kwq/WebCoreViewFactory.h:
+        * kwq/WebCoreViewFactory.m:
+
 2002-06-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Put APPLE_CHANGES
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e141de9..a4bf0cf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-06-24  Chris Blumenberg  <cblu at apple.com>
+
+	Changed the plug-in view constructor to take NSURL's rather
+	than URL strings.	
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPartImpl::requestObject):
+        * kwq/WebCoreViewFactory.h:
+        * kwq/WebCoreViewFactory.m:
+
 2002-06-24  Darin Adler  <darin at apple.com>
 
         * khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): Put APPLE_CHANGES
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ce4862e..1907cfe 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -486,10 +486,10 @@ bool KWQKHTMLPartImpl::requestObject(khtml::RenderPart *frame, const QString &ur
     
     QWidget *widget = new QWidget();
     widget->setView([[WebCoreViewFactory sharedFactory]
-        viewForPluginWithURL:part->completeURL(url).url().getNSString()
+        viewForPluginWithURL:part->completeURL(url).getNSURL()
                     serviceType:serviceType.getNSString()
                     arguments:argsArray
-                        baseURL:m_baseURL.url().getNSString()]);
+                        baseURL:m_baseURL.getNSURL()]);
     frame->setWidget(widget);
     
     return true;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index ce4862e..1907cfe 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -486,10 +486,10 @@ bool KWQKHTMLPartImpl::requestObject(khtml::RenderPart *frame, const QString &ur
     
     QWidget *widget = new QWidget();
     widget->setView([[WebCoreViewFactory sharedFactory]
-        viewForPluginWithURL:part->completeURL(url).url().getNSString()
+        viewForPluginWithURL:part->completeURL(url).getNSURL()
                     serviceType:serviceType.getNSString()
                     arguments:argsArray
-                        baseURL:m_baseURL.url().getNSString()]);
+                        baseURL:m_baseURL.getNSURL()]);
     frame->setWidget(widget);
     
     return true;
diff --git a/WebCore/kwq/WebCoreViewFactory.h b/WebCore/kwq/WebCoreViewFactory.h
index e2cfdcc..fa41c73 100644
--- a/WebCore/kwq/WebCoreViewFactory.h
+++ b/WebCore/kwq/WebCoreViewFactory.h
@@ -35,7 +35,7 @@
 + (WebCoreViewFactory *)sharedFactory;
 - init;
 
-- (NSView *)viewForPluginWithURL:(NSString *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSString *)baseURL;
+- (NSView *)viewForPluginWithURL:(NSURL *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSURL *)baseURL;
 - (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
 
 - (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments;
diff --git a/WebCore/kwq/WebCoreViewFactory.m b/WebCore/kwq/WebCoreViewFactory.m
index a2c0dfe..d6bc37a 100644
--- a/WebCore/kwq/WebCoreViewFactory.m
+++ b/WebCore/kwq/WebCoreViewFactory.m
@@ -45,7 +45,7 @@ static WebCoreViewFactory *sharedFactory;
     return self;
 }
 
-- (NSView *)viewForPluginWithURL:(NSString *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSString *)baseURL;
+- (NSView *)viewForPluginWithURL:(NSURL *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSURL *)baseURL;
 {
     return nil;
 }

-- 
WebKit Debian packaging