Title: [149065] trunk/Source/WebCore
- Revision
- 149065
- Author
- [email protected]
- Date
- 2013-04-24 14:35:41 -0700 (Wed, 24 Apr 2013)
Log Message
Fix a merge error in r149007 (was missing a null check added in r148777).
* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::containingBlockForAbsolutePosition):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149064 => 149065)
--- trunk/Source/WebCore/ChangeLog 2013-04-24 21:33:43 UTC (rev 149064)
+++ trunk/Source/WebCore/ChangeLog 2013-04-24 21:35:41 UTC (rev 149065)
@@ -1,3 +1,10 @@
+2013-04-24 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
Battery API won't return updated battery status until client calls didChangeBatteryStatus
Modified: trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (149064 => 149065)
--- trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2013-04-24 21:33:43 UTC (rev 149064)
+++ trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2013-04-24 21:35:41 UTC (rev 149065)
@@ -54,17 +54,17 @@
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.
- if (object->isRenderInline())
+ if (object && object->isRenderInline())
object = object->containingBlock();
-
+
while (object && object->isAnonymousBlock())
object = object->containingBlock();
-
+
return object;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
