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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 65a16e777c186348d364f0213a97211e988aecc1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 15 18:31:09 2001 +0000

    More work on KWQKHTMLPart <--> WebViewTest integration
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@325 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 09dff27..dfc295c 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -42,6 +42,8 @@
 #include <loader.h>
 
 #include <KWQKHTMLPart.h>
+
+#import <WCURICache.h>
 #import <WCURICacheData.h>
 
 static bool cache_init = false;
@@ -62,12 +64,14 @@ static bool cache_init = false;
     id <WCURICacheData> data;
     
     data = [notification object];
+    
     m_part->write((const char *)[data cacheData], [data cacheDataSize]);    
 }
 
 -(void)cacheFinished:(NSNotification *)notification
 {
     // FIXME: need an implementation for this
+    m_part->closeURL();
 }
 
 @end
@@ -100,7 +104,7 @@ public:
             cache_init = true;
         }
         m_part = part;
-        m_doc = new HTMLDocumentImpl(NULL);
+        m_doc = 0L;
         m_decoder = 0L;
         m_bFirstData = true;
         m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
@@ -170,6 +174,14 @@ bool KHTMLPart::openURL( const KURL &url )
     // Keep a reference to the current working URL.
     d->m_workingURL = url;
 
+    id <WCURICache> cache;
+    NSString *nsurl;
+    
+    cache = WCGetDefaultURICache();
+    nsurl = [NSString stringWithCString:url.url().latin1()];
+    
+    [cache requestWithString:nsurl requestor:d->m_recv];
+
     return true;
 }
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 09dff27..dfc295c 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -42,6 +42,8 @@
 #include <loader.h>
 
 #include <KWQKHTMLPart.h>
+
+#import <WCURICache.h>
 #import <WCURICacheData.h>
 
 static bool cache_init = false;
@@ -62,12 +64,14 @@ static bool cache_init = false;
     id <WCURICacheData> data;
     
     data = [notification object];
+    
     m_part->write((const char *)[data cacheData], [data cacheDataSize]);    
 }
 
 -(void)cacheFinished:(NSNotification *)notification
 {
     // FIXME: need an implementation for this
+    m_part->closeURL();
 }
 
 @end
@@ -100,7 +104,7 @@ public:
             cache_init = true;
         }
         m_part = part;
-        m_doc = new HTMLDocumentImpl(NULL);
+        m_doc = 0L;
         m_decoder = 0L;
         m_bFirstData = true;
         m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
@@ -170,6 +174,14 @@ bool KHTMLPart::openURL( const KURL &url )
     // Keep a reference to the current working URL.
     d->m_workingURL = url;
 
+    id <WCURICache> cache;
+    NSString *nsurl;
+    
+    cache = WCGetDefaultURICache();
+    nsurl = [NSString stringWithCString:url.url().latin1()];
+    
+    [cache requestWithString:nsurl requestor:d->m_recv];
+
     return true;
 }
 
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 09dff27..dfc295c 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -42,6 +42,8 @@
 #include <loader.h>
 
 #include <KWQKHTMLPart.h>
+
+#import <WCURICache.h>
 #import <WCURICacheData.h>
 
 static bool cache_init = false;
@@ -62,12 +64,14 @@ static bool cache_init = false;
     id <WCURICacheData> data;
     
     data = [notification object];
+    
     m_part->write((const char *)[data cacheData], [data cacheDataSize]);    
 }
 
 -(void)cacheFinished:(NSNotification *)notification
 {
     // FIXME: need an implementation for this
+    m_part->closeURL();
 }
 
 @end
@@ -100,7 +104,7 @@ public:
             cache_init = true;
         }
         m_part = part;
-        m_doc = new HTMLDocumentImpl(NULL);
+        m_doc = 0L;
         m_decoder = 0L;
         m_bFirstData = true;
         m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
@@ -170,6 +174,14 @@ bool KHTMLPart::openURL( const KURL &url )
     // Keep a reference to the current working URL.
     d->m_workingURL = url;
 
+    id <WCURICache> cache;
+    NSString *nsurl;
+    
+    cache = WCGetDefaultURICache();
+    nsurl = [NSString stringWithCString:url.url().latin1()];
+    
+    [cache requestWithString:nsurl requestor:d->m_recv];
+
     return true;
 }
 

-- 
WebKit Debian packaging