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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:58:06 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 3d4bde9be6023f7df8bb1c525fe13b031b81d43d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 8 17:58:58 2002 +0000

            * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a1c4ec9..fca8016 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-11-08  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
+
 2002-11-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a1c4ec9..fca8016 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,7 @@
+2002-11-08  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
+
 2002-11-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1c4ec9..fca8016 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,7 @@
+2002-11-08  Darin Adler  <darin at apple.com>
+
+        * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
+
 2002-11-07  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::slotData):
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 134a1f1..efb88d9 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -575,20 +575,16 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
     
     while(!n.isNull()) {
         renderer = n.handle()->renderer();
-        if(n.nodeType() == DOM::Node::TEXT_NODE && renderer != 0) {
+        if (n.nodeType() == DOM::Node::TEXT_NODE && renderer) {
             QString text;
             QString str = n.nodeValue().string();
             khtml::RenderStyle *style = 0;
             
             font = nil;
-            if (renderer){
-                style = renderer->style();
-                if (style) {
-                    font = style->font().getNSFont();
-                }
+            style = renderer->style();
+            if (style) {
+                font = style->font().getNSFont();
             }
-            else
-                printf ("No renderer for %s\n", [text.getNSString() cString]);
             
             hasNewLine = false;            
             if(n == _startNode && n == endNode && startOffset >=0 && endOffset >= 0)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list