Title: [218950] trunk/Source/WebCore
- Revision
- 218950
- Author
- [email protected]
- Date
- 2017-06-29 11:47:25 -0700 (Thu, 29 Jun 2017)
Log Message
Make InlineBox::m_topLeft and m_logicalWidth protected.
https://bugs.webkit.org/show_bug.cgi?id=173973
Reviewed by Simon Fraser.
I don't think this reasoning from 10 years ago is valid anymore ->
"FIXME: Would like to make this protected, but methods are accessing these members over in the part."
(comment was conveniently removed in a later commit).
No change in functionality.
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (218949 => 218950)
--- trunk/Source/WebCore/ChangeLog 2017-06-29 18:14:54 UTC (rev 218949)
+++ trunk/Source/WebCore/ChangeLog 2017-06-29 18:47:25 UTC (rev 218950)
@@ -1,3 +1,19 @@
+2017-06-29 Zalan Bujtas <[email protected]>
+
+ Make InlineBox::m_topLeft and m_logicalWidth protected.
+ https://bugs.webkit.org/show_bug.cgi?id=173973
+
+ Reviewed by Simon Fraser.
+
+ I don't think this reasoning from 10 years ago is valid anymore ->
+ "FIXME: Would like to make this protected, but methods are accessing these members over in the part."
+ (comment was conveniently removed in a later commit).
+
+ No change in functionality.
+
+ * rendering/InlineBox.h:
+ (WebCore::InlineBox::InlineBox):
+
2017-06-29 Wenson Hsieh <[email protected]>
[iOS DnD] Adopt +objectWithItemProviderData: for serializing NSItemProviderReading-conformant objects
Modified: trunk/Source/WebCore/rendering/InlineBox.h (218949 => 218950)
--- trunk/Source/WebCore/rendering/InlineBox.h 2017-06-29 18:14:54 UTC (rev 218949)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2017-06-29 18:47:25 UTC (rev 218950)
@@ -287,9 +287,7 @@
RenderObject& m_renderer;
-public:
- FloatPoint m_topLeft;
- float m_logicalWidth { 0 };
+ float m_expansion { 0 };
#define ADD_BOOLEAN_BITFIELD(name, Name) \
private:\
@@ -367,8 +365,6 @@
};
#undef ADD_BOOLEAN_BITFIELD
-private:
- float m_expansion { 0 };
InlineBoxBitfields m_bitfields;
protected:
@@ -382,9 +378,9 @@
, m_prev(prev)
, m_parent(parent)
, m_renderer(renderer)
+ , m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)
, m_topLeft(topLeft)
, m_logicalWidth(logicalWidth)
- , m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal)
{
}
@@ -411,6 +407,10 @@
// For InlineFlowBox and InlineTextBox
bool extracted() const { return m_bitfields.extracted(); }
+protected:
+ FloatPoint m_topLeft;
+ float m_logicalWidth { 0 };
+
#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
private:
static constexpr unsigned deletionSentinelNotDeletedValue = 0xF0F0F0F0U;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
