[webkit-changes] [155141] trunk/Source/WebCore

[hyatt]

Title: [155141] trunk/Source/WebCore

Revision

155141

Author

hy...@apple.com

Date

2013-09-05 12:47:40 -0700 (Thu, 05 Sep 2013)

Log Message

Make RenderBlock have a protected constructor..
https://bugs.webkit.org/show_bug.cgi?id=120787

Reviewed by Beth Dakin.

Make sure nobody can create a RenderBlock directly. Make sure RenderBlockFlows
get made when a display:block/inline-block/compact/run-in is seen.

* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::createRenderer):
* html/HTMLSummaryElement.cpp:
(WebCore::HTMLSummaryElement::createRenderer):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::createAnonymous):
* rendering/RenderBlock.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::createObject):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/html/HTMLDetailsElement.cpp
• trunk/Source/WebCore/html/HTMLSummaryElement.cpp
• trunk/Source/WebCore/rendering/RenderBlock.cpp
• trunk/Source/WebCore/rendering/RenderBlock.h
• trunk/Source/WebCore/rendering/RenderObject.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (155140 => 155141)

--- trunk/Source/WebCore/ChangeLog	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/ChangeLog	2013-09-05 19:47:40 UTC (rev 155141)
@@ -1,5 +1,25 @@
 2013-09-05  David Hyatt  <hy...@apple.com>
 
+        Make RenderBlock have a protected constructor..
+        https://bugs.webkit.org/show_bug.cgi?id=120787
+
+        Reviewed by Beth Dakin.
+
+        Make sure nobody can create a RenderBlock directly. Make sure RenderBlockFlows
+        get made when a display:block/inline-block/compact/run-in is seen.
+
+        * html/HTMLDetailsElement.cpp:
+        (WebCore::HTMLDetailsElement::createRenderer):
+        * html/HTMLSummaryElement.cpp:
+        (WebCore::HTMLSummaryElement::createRenderer):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::createAnonymous):
+        * rendering/RenderBlock.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::createObject):
+
+2013-09-05  David Hyatt  <hy...@apple.com>
+
         Add new RenderBlockFlow class
         https://bugs.webkit.org/show_bug.cgi?id=120777
 

Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (155140 => 155141)

--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp	2013-09-05 19:47:40 UTC (rev 155141)
@@ -27,7 +27,7 @@
 #include "HTMLSummaryElement.h"
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
 #include "ShadowRoot.h"
 #include "Text.h"
 
@@ -113,7 +113,7 @@
 
 RenderObject* HTMLDetailsElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    return new (arena) RenderBlock(this);
+    return new (arena) RenderBlockFlow(this);
 }
 
 void HTMLDetailsElement::didAddUserAgentShadowRoot(ShadowRoot* root)

Modified: trunk/Source/WebCore/html/HTMLSummaryElement.cpp (155140 => 155141)

--- trunk/Source/WebCore/html/HTMLSummaryElement.cpp	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.cpp	2013-09-05 19:47:40 UTC (rev 155141)
@@ -30,7 +30,7 @@
 #include "MouseEvent.h"
 #include "NodeRenderingTraversal.h"
 #include "PlatformMouseEvent.h"
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
 #include "ShadowRoot.h"
 
 namespace WebCore {
@@ -68,7 +68,7 @@
 
 RenderObject* HTMLSummaryElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    return new (arena) RenderBlock(this);
+    return new (arena) RenderBlockFlow(this);
 }
 
 bool HTMLSummaryElement::childShouldCreateRenderer(const Node* child) const

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (155140 => 155141)

--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-09-05 19:47:40 UTC (rev 155141)
@@ -237,7 +237,7 @@
 
 RenderBlock* RenderBlock::createAnonymous(Document* document)
 {
-    RenderBlock* renderer = new (document->renderArena()) RenderBlock(0);
+    RenderBlock* renderer = new (document->renderArena()) RenderBlockFlow(0);
     renderer->setDocumentForAnonymous(document);
     return renderer;
 }

Modified: trunk/Source/WebCore/rendering/RenderBlock.h (155140 => 155141)

--- trunk/Source/WebCore/rendering/RenderBlock.h	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/rendering/RenderBlock.h	2013-09-05 19:47:40 UTC (rev 155141)
@@ -89,9 +89,11 @@
     template <class> friend struct ValueToString;
 #endif
 
+protected:
     explicit RenderBlock(ContainerNode*);
     virtual ~RenderBlock();
 
+public:
     static RenderBlock* createAnonymous(Document*);
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (155140 => 155141)

--- trunk/Source/WebCore/rendering/RenderObject.cpp	2013-09-05 19:38:48 UTC (rev 155140)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2013-09-05 19:47:40 UTC (rev 155141)
@@ -207,7 +207,7 @@
     case COMPACT:
         if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) && document.regionBasedColumnsEnabled())
             return new (arena) RenderMultiColumnBlock(element);
-        return new (arena) RenderBlock(element);
+        return new (arena) RenderBlockFlow(element);
     case LIST_ITEM:
         return new (arena) RenderListItem(element);
     case TABLE:

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes