Title: [170057] trunk/Source/WebCore
- Revision
- 170057
- Author
- [email protected]
- Date
- 2014-06-17 10:29:44 -0700 (Tue, 17 Jun 2014)
Log Message
Use references instead of pointers to RenderBlock in enclosingBoxModelObject()
https://bugs.webkit.org/show_bug.cgi?id=133978
Patch by Miyoung Shin <[email protected]> on 2014-06-17
Reviewed by Andreas Kling.
Just a straightforward conversion from pointers to references.
No new tests, no behavior change.
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::paint):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintObject):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::enclosingBoxModelObject):
* rendering/RenderObject.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170056 => 170057)
--- trunk/Source/WebCore/ChangeLog 2014-06-17 17:23:23 UTC (rev 170056)
+++ trunk/Source/WebCore/ChangeLog 2014-06-17 17:29:44 UTC (rev 170057)
@@ -1,3 +1,22 @@
+2014-06-17 Miyoung Shin <[email protected]>
+
+ Use references instead of pointers to RenderBlock in enclosingBoxModelObject()
+ https://bugs.webkit.org/show_bug.cgi?id=133978
+
+ Reviewed by Andreas Kling.
+
+ Just a straightforward conversion from pointers to references.
+
+ No new tests, no behavior change.
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::paint):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintObject):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::enclosingBoxModelObject):
+ * rendering/RenderObject.h:
+
2014-06-17 Zan Dobersek <[email protected]>
Cache the gst_query_get_n_buffering_ranges() return value for the for-loop conditional
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (170056 => 170057)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-06-17 17:23:23 UTC (rev 170056)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-06-17 17:29:44 UTC (rev 170057)
@@ -1134,7 +1134,7 @@
containingBlockPaintsContinuationOutline = false;
else {
cb = enclosingAnonymousBlock->containingBlock();
- for (auto box = &renderer(); box != cb; box = box->parent()->enclosingBoxModelObject()) {
+ for (auto box = &renderer(); box != cb; box = &box->parent()->enclosingBoxModelObject()) {
if (box->hasSelfPaintingLayer()) {
containingBlockPaintsContinuationOutline = false;
break;
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (170056 => 170057)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-06-17 17:23:23 UTC (rev 170056)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-06-17 17:29:44 UTC (rev 170057)
@@ -1703,7 +1703,7 @@
RenderBlock* cb = containingBlock();
bool inlineEnclosedInSelfPaintingLayer = false;
- for (RenderBoxModelObject* box = inlineRenderer; box != cb; box = box->parent()->enclosingBoxModelObject()) {
+ for (RenderBoxModelObject* box = inlineRenderer; box != cb; box = &box->parent()->enclosingBoxModelObject()) {
if (box->hasSelfPaintingLayer()) {
inlineEnclosedInSelfPaintingLayer = true;
break;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (170056 => 170057)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-17 17:23:23 UTC (rev 170056)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-06-17 17:29:44 UTC (rev 170057)
@@ -495,10 +495,9 @@
return *lineageOfType<RenderBox>(const_cast<RenderObject&>(*this)).first();
}
-RenderBoxModelObject* RenderObject::enclosingBoxModelObject() const
+RenderBoxModelObject& RenderObject::enclosingBoxModelObject() const
{
- // FIXME: This should return a reference; it can always find the root RenderView.
- return lineageOfType<RenderBoxModelObject>(const_cast<RenderObject&>(*this)).first();
+ return *lineageOfType<RenderBoxModelObject>(const_cast<RenderObject&>(*this)).first();
}
bool RenderObject::fixedPositionedWithNamedFlowContainingBlock() const
Modified: trunk/Source/WebCore/rendering/RenderObject.h (170056 => 170057)
--- trunk/Source/WebCore/rendering/RenderObject.h 2014-06-17 17:23:23 UTC (rev 170056)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-06-17 17:29:44 UTC (rev 170057)
@@ -207,7 +207,7 @@
// Convenience function for getting to the nearest enclosing box of a RenderObject.
RenderBox& enclosingBox() const;
- RenderBoxModelObject* enclosingBoxModelObject() const;
+ RenderBoxModelObject& enclosingBoxModelObject() const;
bool fixedPositionedWithNamedFlowContainingBlock() const;
// Function to return our enclosing flow thread if we are contained inside one. This
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
