Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 184023003: Make InlineBox::renderer() and related subclass methods return reference. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index 53135d4d80a8e3c61b1390a16348f3e9eea4bf64..d05eed6c0c8a586fdcc9c337b061c73bb561ae8b 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -858,7 +858,7 @@ void RenderBlockFlow::rebuildFloatsFromIntruding()
floatMap.remove(floatingObject->renderer());
if (oldFloatingObject->originatingLine() && !selfNeedsLayout()) {
- ASSERT(oldFloatingObject->originatingLine()->renderer() == this);
+ ASSERT(&oldFloatingObject->originatingLine()->renderer() == this);
oldFloatingObject->originatingLine()->markDirty();
}
delete oldFloatingObject;
@@ -2290,7 +2290,7 @@ void RenderBlockFlow::removeFloatingObject(RenderBox* floatBox)
}
if (floatingObject->originatingLine()) {
if (!selfNeedsLayout()) {
- ASSERT(floatingObject->originatingLine()->renderer() == this);
+ ASSERT(&floatingObject->originatingLine()->renderer() == this);
floatingObject->originatingLine()->markDirty();
}
#if !ASSERT_DISABLED
@@ -2810,7 +2810,7 @@ TextRun RenderBlockFlow::constructTextRun(RenderObject* context, const Font& fon
RootInlineBox* RenderBlockFlow::createRootInlineBox()
{
- return new RootInlineBox(this);
+ return new RootInlineBox(*this);
}
void RenderBlockFlow::createMultiColumnFlowThreadIfNeeded()

Powered by Google App Engine
This is Rietveld 408576698