[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[rolandsteiner at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit f48963f7017b2c41d0d022f4186db04a5a860891
Author: rolandsteiner at chromium.org <rolandsteiner at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 02:54:02 2010 +0000

    Incorrect boolean expression in isMailBlockquote() (WebCore/htmlediting.cpp)
    https://bugs.webkit.org/show_bug.cgi?id=34156
    
    Reviewed by Darin Adler.
    
    No new tests (minor code change).
    
    * editing/htmlediting.cpp:
    (WebCore::isMailBlockquote):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a7d0ca..0795370 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-26  Roland Steiner  <rolandsteiner at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Incorrect boolean expression in isMailBlockquote() (WebCore/htmlediting.cpp)
+        https://bugs.webkit.org/show_bug.cgi?id=34156
+
+        No new tests (minor code change).
+
+        * editing/htmlediting.cpp:
+        (WebCore::isMailBlockquote):
+
 2010-01-26  Peter Kasting  <pkasting at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp
index 46315f6..b58dff3 100644
--- a/WebCore/editing/htmlediting.cpp
+++ b/WebCore/editing/htmlediting.cpp
@@ -983,7 +983,7 @@ unsigned numEnclosingMailBlockquotes(const Position& p)
 
 bool isMailBlockquote(const Node *node)
 {
-    if (!node || (!node->isElementNode() && !node->hasTagName(blockquoteTag)))
+    if (!node || !node->hasTagName(blockquoteTag))
         return false;
         
     return static_cast<const Element *>(node)->getAttribute("type") == "cite";

-- 
WebKit Debian packaging