Fix for 4030890, regression with <sup> on Google. Fix some bogus != comparison...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Mar 2005 04:33:50 +0000 (04:33 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Mar 2005 04:33:50 +0000 (04:33 +0000)
        Reviewed by John

        (RenderObject::getVerticalPosition):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_object.cpp

index 84fdaf68d31d27c97dd5ddd30f18f76611ad4862..f62f1d182af5884d0e1280b01e7ebb22b5471b56 100644 (file)
@@ -1,3 +1,11 @@
+2005-03-01  David Hyatt  <hyatt@apple.com>
+
+       Fix for 4030890, regression with <sup> on Google.  Fix some bogus != comparison checks in verticalPositionHint.
+       
+        Reviewed by John
+
+        (RenderObject::getVerticalPosition):
+        
 2005-03-01  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/4030669> smart delete does not delete spaces from pasted content
@@ -71,6 +79,7 @@
         * layout-tests/editing/deleting/smart-delete-002-expected.txt: Added.
         * layout-tests/editing/deleting/smart-delete-002.html: Added.
 
+>>>>>>> 1.3972
 2005-03-01  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Vicki
index c03cae6d73fe2b5005bb2b103dd1a9a8e5d61c54..dcaf0eab7e4b65dc6afdc96dae033e76e8f279ff 100644 (file)
@@ -1968,7 +1968,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
     } else if ( va == LENGTH ) {
         vpos = -style()->verticalAlignLength().width( lineHeight( firstLine ) );
     } else  {
-        bool checkParent = parent()->isInline() && !parent()->isInlineBlockOrInlineTable() && !parent()->style()->verticalAlign() == TOP && !parent()->style()->verticalAlign() == BOTTOM;
+        bool checkParent = parent()->isInline() && !parent()->isInlineBlockOrInlineTable() && parent()->style()->verticalAlign() != TOP && parent()->style()->verticalAlign() != BOTTOM;
         vpos = checkParent ? parent()->verticalPositionHint( firstLine ) : 0;
         // don't allow elements nested inside text-top to have a different valignment.
         if ( va == BASELINE )