[webkit-changes] [229231] releases/WebKitGTK/webkit-2.20/Source/WebCore

Mon, 05 Mar 2018 02:49:44 -0800

Title: [229231] releases/WebKitGTK/webkit-2.20/Source/WebCore
Revision
229231
Author
[email protected]
Date
2018-03-05 02:48:55 -0800 (Mon, 05 Mar 2018)

Log Message

Merge r228948 - [RenderTreeBuilder] Add WARN_UNUSED_RETURN to detach()
https://bugs.webkit.org/show_bug.cgi?id=183073
<rdar://problem/37814585>

Reviewed by Antti Koivisto.

So that we don't destroy a renderer accidentally.

* rendering/updating/RenderTreeBuilderBlock.h:
* rendering/updating/RenderTreeBuilderRuby.h:
* rendering/updating/RenderTreeBuilderSVG.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229230 => 229231)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-03-05 10:10:06 UTC (rev 229230)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-03-05 10:48:55 UTC (rev 229231)
@@ -1,3 +1,17 @@
+2018-02-23  Zalan Bujtas  <[email protected]>
+
+        [RenderTreeBuilder] Add WARN_UNUSED_RETURN to detach()
+        https://bugs.webkit.org/show_bug.cgi?id=183073
+        <rdar://problem/37814585>
+
+        Reviewed by Antti Koivisto.
+
+        So that we don't destroy a renderer accidentally.
+
+        * rendering/updating/RenderTreeBuilderBlock.h:
+        * rendering/updating/RenderTreeBuilderRuby.h:
+        * rendering/updating/RenderTreeBuilderSVG.h:
+
 2018-02-23  Philippe Normand  <[email protected]>
 
         [GStreamer] HTTP totalBytes query returns 0 after seeking (sometimes)

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.h (229230 => 229231)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.h	2018-03-05 10:10:06 UTC (rev 229230)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.h	2018-03-05 10:48:55 UTC (rev 229231)
@@ -36,8 +36,8 @@
     void attach(RenderBlock& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
     void attachIgnoringContinuation(RenderBlock& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
 
-    RenderPtr<RenderObject> detach(RenderBlock& parent, RenderObject& oldChild);
-    RenderPtr<RenderObject> detach(RenderBlockFlow& parent, RenderObject& child);
+    RenderPtr<RenderObject> detach(RenderBlock& parent, RenderObject& oldChild) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderBlockFlow& parent, RenderObject& child) WARN_UNUSED_RETURN;
 
     void dropAnonymousBoxChild(RenderBlock& parent, RenderBlock& child);
     void childBecameNonInline(RenderBlock& parent, RenderElement& child);

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h (229230 => 229231)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h	2018-03-05 10:10:06 UTC (rev 229230)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h	2018-03-05 10:48:55 UTC (rev 229231)
@@ -42,9 +42,9 @@
     Ruby(RenderTreeBuilder&);
 
     void attach(RenderRubyRun& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
-    RenderPtr<RenderObject> detach(RenderRubyAsInline& parent, RenderObject& child);
-    RenderPtr<RenderObject> detach(RenderRubyAsBlock& parent, RenderObject& child);
-    RenderPtr<RenderObject> detach(RenderRubyRun& parent, RenderObject& child);
+    RenderPtr<RenderObject> detach(RenderRubyAsInline& parent, RenderObject& child) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderRubyAsBlock& parent, RenderObject& child) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderRubyRun& parent, RenderObject& child) WARN_UNUSED_RETURN;
 
     void moveChildren(RenderRubyBase& from, RenderRubyBase& to);

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h (229230 => 229231)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h	2018-03-05 10:10:06 UTC (rev 229230)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h	2018-03-05 10:48:55 UTC (rev 229231)
@@ -43,10 +43,10 @@
     void attach(RenderSVGRoot& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
     void attach(RenderSVGText& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
 
-    RenderPtr<RenderObject> detach(RenderSVGText& parent, RenderObject& child);
-    RenderPtr<RenderObject> detach(RenderSVGInline& parent, RenderObject& child);
-    RenderPtr<RenderObject> detach(RenderSVGContainer& parent, RenderObject& child);
-    RenderPtr<RenderObject> detach(RenderSVGRoot& parent, RenderObject& child);
+    RenderPtr<RenderObject> detach(RenderSVGText& parent, RenderObject& child) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderSVGInline& parent, RenderObject& child) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderSVGContainer& parent, RenderObject& child) WARN_UNUSED_RETURN;
+    RenderPtr<RenderObject> detach(RenderSVGRoot& parent, RenderObject& child) WARN_UNUSED_RETURN;
 
 private:
     RenderTreeBuilder& m_builder;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to