Title: [199984] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199984
- Author
- [email protected]
- Date
- 2016-04-25 03:08:13 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199113 - Add ASSERT_WITH_SECURITY_IMPLICATION when a float box is referenced by multiple RootInlineBoxes.
https://bugs.webkit.org/show_bug.cgi?id=156297
<rdar://problem/25580844>
Reviewed by Brent Fulgham.
See http://trac.webkit.org/changeset/199101
No change in functionality.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::appendFloatingObjectToLastLine):
(WebCore::RenderBlockFlow::reattachCleanLineFloats):
(WebCore::RenderBlockFlow::determineStartPosition):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199983 => 199984)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 10:07:17 UTC (rev 199983)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 10:08:13 UTC (rev 199984)
@@ -1,5 +1,22 @@
2016-04-06 Zalan Bujtas <[email protected]>
+ Add ASSERT_WITH_SECURITY_IMPLICATION when a float box is referenced by multiple RootInlineBoxes.
+ https://bugs.webkit.org/show_bug.cgi?id=156297
+ <rdar://problem/25580844>
+
+ Reviewed by Brent Fulgham.
+
+ See http://trac.webkit.org/changeset/199101
+
+ No change in functionality.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::appendFloatingObjectToLastLine):
+ (WebCore::RenderBlockFlow::reattachCleanLineFloats):
+ (WebCore::RenderBlockFlow::determineStartPosition):
+
+2016-04-06 Zalan Bujtas <[email protected]>
+
ASSERTION FAILED: !floatingObject->originatingLine() in WebCore::RenderBlockFlow::linkToEndLineIfNeeded
https://bugs.webkit.org/show_bug.cgi?id=153001
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp (199983 => 199984)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-04-25 10:07:17 UTC (rev 199983)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-04-25 10:08:13 UTC (rev 199984)
@@ -1006,7 +1006,7 @@
void RenderBlockFlow::appendFloatingObjectToLastLine(FloatingObject* floatingObject)
{
- ASSERT(!floatingObject->originatingLine());
+ ASSERT_WITH_SECURITY_IMPLICATION(!floatingObject->originatingLine());
floatingObject->setOriginatingLine(lastRootBox());
lastRootBox()->appendFloat(floatingObject->renderer());
}
@@ -1477,11 +1477,11 @@
auto* floatingObject = insertFloatingObject(*floatingBox);
if (isFirstCleanLine && floatingObject->originatingLine()) {
// Float box does not belong to this line anymore.
- ASSERT(cleanLine.prevRootBox() == floatingObject->originatingLine());
+ ASSERT_WITH_SECURITY_IMPLICATION(cleanLine.prevRootBox() == floatingObject->originatingLine());
cleanLine.removeFloat(*floatingBox);
continue;
}
- ASSERT(!floatingObject->originatingLine());
+ ASSERT_WITH_SECURITY_IMPLICATION(!floatingObject->originatingLine());
floatingObject->setOriginatingLine(&cleanLine);
setLogicalHeight(logicalTopForChild(*floatingBox) - marginBeforeForChild(*floatingBox) + delta);
positionNewFloats();
@@ -1805,7 +1805,7 @@
for (auto it = cleanLineFloats->begin(), end = cleanLineFloats->end(); it != end; ++it) {
RenderBox* floatingBox = *it;
FloatingObject* floatingObject = insertFloatingObject(*floatingBox);
- ASSERT(!floatingObject->originatingLine());
+ ASSERT_WITH_SECURITY_IMPLICATION(!floatingObject->originatingLine());
floatingObject->setOriginatingLine(line);
setLogicalHeight(logicalTopForChild(*floatingBox) - marginBeforeForChild(*floatingBox));
positionNewFloats();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
