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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:09:17 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 9756ac2cabc4352b33a300dfa127b75daa6aa97b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 5 08:58:50 2003 +0000

    	- fixed deployment build
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::fileWrapperForElement):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 660de9a..705819d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-11-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed deployment build
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::fileWrapperForElement):
+
 2003-11-04  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0ad80d6..08b1e24 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2129,10 +2129,10 @@ struct ListItemInfo {
 
 NSFileWrapper *KWQKHTMLPart::fileWrapperForElement(ElementImpl *e)
 {
-    NSFileWrapper *wrapper = nil;
-
     KWQ_BLOCK_EXCEPTIONS;
     
+    NSFileWrapper *wrapper = nil;
+
     DOMString attr = e->getAttribute(ATTR_SRC);
     if (!attr.isEmpty()) {
         NSURL *URL = completeURL(attr.string()).getNSURL();
@@ -2146,10 +2146,12 @@ NSFileWrapper *KWQKHTMLPart::fileWrapperForElement(ElementImpl *e)
         [wrapper setPreferredFilename:@"image.tiff"];
         [wrapper autorelease];
     }
+
+    return wrapper;
     
     KWQ_UNBLOCK_EXCEPTIONS;
 
-    return wrapper;
+    return nil;
 }
 
 static ElementImpl *listParent(ElementImpl *item)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list