Title: [163934] trunk/Source/WebCore
- Revision
- 163934
- Author
- [email protected]
- Date
- 2014-02-11 19:53:02 -0800 (Tue, 11 Feb 2014)
Log Message
Protect some RenderFlowThread functions.
<https://webkit.org/b/128642>
Make the RenderFlowThread constructor protected and a handful of
member functions private.
Reviewed by Anders Carlsson.
* rendering/RenderFlowThread.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163933 => 163934)
--- trunk/Source/WebCore/ChangeLog 2014-02-12 03:51:06 UTC (rev 163933)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 03:53:02 UTC (rev 163934)
@@ -1,5 +1,17 @@
2014-02-11 Andreas Kling <[email protected]>
+ Protect some RenderFlowThread functions.
+ <https://webkit.org/b/128642>
+
+ Make the RenderFlowThread constructor protected and a handful of
+ member functions private.
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderFlowThread.h:
+
+2014-02-11 Andreas Kling <[email protected]>
+
Don't allocate RenderNamedFlowThread's child list separately.
<https://webkit.org/b/128640>
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (163933 => 163934)
--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-02-12 03:51:06 UTC (rev 163933)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-02-12 03:53:02 UTC (rev 163934)
@@ -58,17 +58,8 @@
class RenderFlowThread: public RenderBlockFlow {
public:
- RenderFlowThread(Document&, PassRef<RenderStyle>);
- virtual ~RenderFlowThread() { };
-
- virtual bool isRenderFlowThread() const override final { return true; }
+ virtual ~RenderFlowThread() { }
- virtual void layout() override final;
-
- // Always create a RenderLayer for the RenderFlowThread so that we
- // can easily avoid drawing the children directly.
- virtual bool requiresLayer() const override final { return true; }
-
virtual void removeFlowChildInfo(RenderObject*);
#ifndef NDEBUG
bool hasChildInfo(RenderObject* child) const { return child && child->isBox() && m_regionRangeMap.contains(toRenderBox(child)); }
@@ -218,7 +209,17 @@
bool regionInRange(const RenderRegion* targetRegion, const RenderRegion* startRegion, const RenderRegion* endRegion) const;
+private:
+ virtual bool isRenderFlowThread() const override final { return true; }
+ virtual void layout() override final;
+
+ // Always create a RenderLayer for the RenderFlowThread so that we
+ // can easily avoid drawing the children directly.
+ virtual bool requiresLayer() const override final { return true; }
+
protected:
+ RenderFlowThread(Document&, PassRef<RenderStyle>);
+
virtual const char* renderName() const = 0;
// Overridden by columns/pages to set up an initial logical width of the page width even when
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
