Changeset 155141 in webkit

Timestamp:

Sep 5, 2013 12:47:40 PM (11 years ago)

Author:

hyatt@apple.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLDetailsElement.cpp (modified) (2 diffs)
• html/HTMLSummaryElement.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-05  David Hyatt  <hyatt@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  <hyatt@apple.com>
 

trunk/Source/WebCore/html/HTMLDetailsElement.cpp

@@ -28 +28 @@
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
 #include "ShadowRoot.h"
 #include "Text.h"
@@ -114 +114 @@
 RenderObject* HTMLDetailsElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    return new (arena) RenderBlock(this);
+    return new (arena) RenderBlockFlow(this);
 }
 

trunk/Source/WebCore/html/HTMLSummaryElement.cpp

@@ -31 +31 @@
 #include "NodeRenderingTraversal.h"
 #include "PlatformMouseEvent.h"
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
 #include "ShadowRoot.h"
 
@@ -69 +69 @@
 RenderObject* HTMLSummaryElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    return new (arena) RenderBlock(this);
+    return new (arena) RenderBlockFlow(this);
 }
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -238 +238 @@
 RenderBlock* RenderBlock::createAnonymous(Document* document)
 {
-    RenderBlock* renderer = new (document->renderArena()) RenderBlock(0);
+    RenderBlock* renderer = new (document->renderArena()) RenderBlockFlow(0);
     renderer->setDocumentForAnonymous(document);
     return renderer;

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -90 +90 @@
 #endif
 
+protected:
     explicit RenderBlock(ContainerNode*);
     virtual ~RenderBlock();
 
+public:
     static RenderBlock* createAnonymous(Document*);
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -208 +208 @@
         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);