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

Sat Sep 26 07:19:17 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 50560aa1d66532dd5c17fcb53a4710d45362bd4d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 12 17:05:39 2003 +0000

            Reviewed by Dave.
    
    	- fixed a bunch of places where KHTML did !x == y instead of !(x == y) or x != y.
    
            * khtml/css/cssstyleselector.cpp: (CSSStyleSelector::applyRule):
            * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
            * khtml/misc/loader.cpp: (Cache::requestImage), (Cache::requestStyleSheet):
            * khtml/rendering/render_flow.cpp: (RenderFlow::setStyle):
    	Changed !x == y to x != y. In each case, there's a reason that this does not create
    	any problem in practice, which is why we didn't rush to get this in for beta 1.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 66bc6b0..5496e6d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-01-12  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed a bunch of places where KHTML did !x == y instead of !(x == y) or x != y.
+
+        * khtml/css/cssstyleselector.cpp: (CSSStyleSelector::applyRule):
+        * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
+        * khtml/misc/loader.cpp: (Cache::requestImage), (Cache::requestStyleSheet):
+        * khtml/rendering/render_flow.cpp: (RenderFlow::setStyle):
+	Changed !x == y to x != y. In each case, there's a reason that this does not create
+	any problem in practice, which is why we didn't rush to get this in for beta 1.
+
 2003-01-11  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 66bc6b0..5496e6d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-01-12  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed a bunch of places where KHTML did !x == y instead of !(x == y) or x != y.
+
+        * khtml/css/cssstyleselector.cpp: (CSSStyleSelector::applyRule):
+        * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode):
+        * khtml/misc/loader.cpp: (Cache::requestImage), (Cache::requestStyleSheet):
+        * khtml/rendering/render_flow.cpp: (RenderFlow::setStyle):
+	Changed !x == y to x != y. In each case, there's a reason that this does not create
+	any problem in practice, which is why we didn't rush to get this in for beta 1.
+
 2003-01-11  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index d234808..f832c82 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2212,7 +2212,7 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
     case CSS_PROP_HEIGHT:
     case CSS_PROP_MIN_HEIGHT:
         // +inherit +auto !can be calculted directly!
-        if(!prop->m_id == CSS_PROP_MAX_HEIGHT && primitiveValue &&
+        if(prop->m_id != CSS_PROP_MAX_HEIGHT && primitiveValue &&
            primitiveValue->getIdent() == CSS_VAL_AUTO)
             apply = true;
         if(value->cssValueType() == CSSValue::CSS_INHERIT)
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index b24b838..2e501bc 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -389,7 +389,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
             break;
         case ID_HEAD:
             // ### alllow not having <HTML> in at all, as per HTML spec
-            if (!current->isDocumentNode() && !current->id() == ID_HTML )
+            if (!current->isDocumentNode() && current->id() != ID_HTML )
                 return false;
             break;
             // We can deal with a base, meta and link element in the body, by just adding the element to head.
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 095ee3b..2c77272 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -1499,7 +1499,7 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
 
     o->setExpireDate(_expireDate, true);
 
-    if(!o->type() == CachedObject::Image)
+    if(o->type() != CachedObject::Image)
     {
 #ifdef CACHE_DEBUG
         kdDebug( 6060 ) << "Cache::Internal Error in requestImage url=" << kurl.url() << "!" << endl;
@@ -1573,7 +1573,7 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
 
     o->setExpireDate(_expireDate, true);
 
-    if(!o->type() == CachedObject::CSSStyleSheet)
+    if(o->type() != CachedObject::CSSStyleSheet)
     {
 #ifdef CACHE_DEBUG
         kdDebug( 6060 ) << "Cache::Internal Error in requestStyleSheet url=" << kurl.url() << "!" << endl;
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 4d9a945..927a4b4 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -76,7 +76,7 @@ void RenderFlow::setStyle(RenderStyle *_style)
     if (!isTableCell() && (isPositioned() || isRelPositioned() || style()->overflow()==OHIDDEN) && !m_layer)
         m_layer = new (renderArena()) RenderLayer(this);
     
-    if(isFloating() || !style()->display() == INLINE)
+    if(isFloating() || style()->display() != INLINE)
         setInline(false);
 
     if (isInline() && !m_childrenInline)

-- 
WebKit Debian packaging

