Title: [204533] trunk/Source/WebCore
- Revision
- 204533
- Author
- [email protected]
- Date
- 2016-08-16 15:44:21 -0700 (Tue, 16 Aug 2016)
Log Message
Rename FrameView::m_layoutDisallowed to m_layoutDisallowedCount
https://bugs.webkit.org/show_bug.cgi?id=160918
Reviewed by Zalan Bujtas.
m_layoutDisallowedCount makes it clearer that it's accumulated.
* page/FrameView.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204532 => 204533)
--- trunk/Source/WebCore/ChangeLog 2016-08-16 22:41:19 UTC (rev 204532)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 22:44:21 UTC (rev 204533)
@@ -1,3 +1,14 @@
+2016-08-16 Simon Fraser <[email protected]>
+
+ Rename FrameView::m_layoutDisallowed to m_layoutDisallowedCount
+ https://bugs.webkit.org/show_bug.cgi?id=160918
+
+ Reviewed by Zalan Bujtas.
+
+ m_layoutDisallowedCount makes it clearer that it's accumulated.
+
+ * page/FrameView.h:
+
2016-08-16 Anders Carlsson <[email protected]>
Rename SSLKeyGeneratorMac.cpp to SSLKeyGeneratorMac.mm.
Modified: trunk/Source/WebCore/page/FrameView.h (204532 => 204533)
--- trunk/Source/WebCore/page/FrameView.h 2016-08-16 22:41:19 UTC (rev 204532)
+++ trunk/Source/WebCore/page/FrameView.h 2016-08-16 22:44:21 UTC (rev 204533)
@@ -363,9 +363,9 @@
bool isInChildFrameWithFrameFlattening() const;
- void startDisallowingLayout() { ++m_layoutDisallowed; }
- void endDisallowingLayout() { ASSERT(m_layoutDisallowed > 0); --m_layoutDisallowed; }
- bool layoutDisallowed() const { return m_layoutDisallowed; }
+ void startDisallowingLayout() { ++m_layoutDisallowedCount; }
+ void endDisallowingLayout() { ASSERT(m_layoutDisallowedCount > 0); --m_layoutDisallowedCount; }
+ bool layoutDisallowed() const { return m_layoutDisallowedCount; }
static double currentPaintTimeStamp() { return sCurrentPaintTimeStamp; } // returns 0 if not painting
@@ -763,7 +763,7 @@
unsigned m_deferSetNeedsLayoutCount;
bool m_setNeedsLayoutWasDeferred;
- int m_layoutDisallowed { 0 };
+ int m_layoutDisallowedCount { 0 };
RefPtr<Node> m_nodeToDraw;
PaintBehavior m_paintBehavior;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
