Fix a merge error in r149007 (was missing a null check added in r148777).
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Apr 2013 21:35:41 +0000 (21:35 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Apr 2013 21:35:41 +0000 (21:35 +0000)
* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::containingBlockForAbsolutePosition):

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/LogicalSelectionOffsetCaches.h

index c12ec2e0eaf082e633ab7748a25d8d35480fb870..4f3ad21355100f4d6a40329c1f78d4b0afc0ac4f 100644 (file)
@@ -1,3 +1,10 @@
+2013-04-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Fix a merge error in r149007 (was missing a null check added in r148777).
+
+        * rendering/LogicalSelectionOffsetCaches.h:
+        (WebCore::containingBlockForAbsolutePosition):
+
 2013-04-24  Otto Derek Cheung  <otcheung@rim.com>
 
         Battery API won't return updated battery status until client calls didChangeBatteryStatus
 2013-04-24  Otto Derek Cheung  <otcheung@rim.com>
 
         Battery API won't return updated battery status until client calls didChangeBatteryStatus
index 5281777b4cd3462fa4f7b2da0bb3b8120aea9cdd..3c59fb67617f81bfcbb700e91626dde5ebf8fd50 100644 (file)
@@ -54,17 +54,17 @@ static inline RenderObject* containingBlockForAbsolutePosition(RenderObject* par
     RenderObject* object = parent;
     while (object && !isContainingBlockCandidateForAbsolutelyPositionedObject(object))
         object = object->parent();
     RenderObject* object = parent;
     while (object && !isContainingBlockCandidateForAbsolutelyPositionedObject(object))
         object = object->parent();
-    
+
     // For a relatively positioned inline, return its nearest non-anonymous containing block,
     // not the inline itself, to avoid having a positioned objects list in all RenderInlines
     // and use RenderBlock* as RenderObject::containingBlock's return type.
     // Use RenderBlock::container() to obtain the inline.
     // For a relatively positioned inline, return its nearest non-anonymous containing block,
     // not the inline itself, to avoid having a positioned objects list in all RenderInlines
     // and use RenderBlock* as RenderObject::containingBlock's return type.
     // Use RenderBlock::container() to obtain the inline.
-    if (object->isRenderInline())
+    if (object && object->isRenderInline())
         object = object->containingBlock();
         object = object->containingBlock();
-    
+
     while (object && object->isAnonymousBlock())
         object = object->containingBlock();
     while (object && object->isAnonymousBlock())
         object = object->containingBlock();
-    
+
     return object;
 }
 
     return object;
 }