Title: [164303] trunk/Source/WebCore
- Revision
- 164303
- Author
- mmaxfi...@apple.com
- Date
- 2014-02-18 12:13:16 -0800 (Tue, 18 Feb 2014)
Log Message
Rename convertFixedAndStickyPosition() to convertPositionStyle()
https://bugs.webkit.org/show_bug.cgi?id=128987
Reviewed by NOBODY. This is addressing a post-commit review from Dean Jackson.
No new tests are necessary because there is no behavior change
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::convertPositionStyle):
* editing/EditingStyle.h:
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::appendElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164302 => 164303)
--- trunk/Source/WebCore/ChangeLog 2014-02-18 20:05:42 UTC (rev 164302)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 20:13:16 UTC (rev 164303)
@@ -1,3 +1,18 @@
+2014-02-18 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Rename convertFixedAndStickyPosition() to convertPositionStyle()
+ https://bugs.webkit.org/show_bug.cgi?id=128987
+
+ Reviewed by NOBODY. This is addressing a post-commit review from Dean Jackson.
+
+ No new tests are necessary because there is no behavior change
+
+ * editing/EditingStyle.cpp:
+ (WebCore::EditingStyle::convertPositionStyle):
+ * editing/EditingStyle.h:
+ * editing/markup.cpp:
+ (WebCore::StyledMarkupAccumulator::appendElement):
+
2014-02-18 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r164296.
@@ -21,7 +36,7 @@
1. Make sure that position:absolute elements trigger the position:relative wrapping (as
well as position:fixed)
- 2. Now that we copy position:sticky, convert that to position:fixed
+ 2. Now that we copy position:sticky, convert that to position:static
Tests: editing/pasteboard/copy-paste-converts-fixed.html
editing/pasteboard/copy-paste-converts-sticky.html
Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (164302 => 164303)
--- trunk/Source/WebCore/editing/EditingStyle.cpp 2014-02-18 20:05:42 UTC (rev 164302)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2014-02-18 20:13:16 UTC (rev 164303)
@@ -1221,7 +1221,7 @@
m_mutableStyle->setProperty(CSSPropertyDisplay, CSSValueInline, propertyIsImportant);
}
-bool EditingStyle::convertFixedAndStickyPosition()
+bool EditingStyle::convertPositionStyle()
{
if (!m_mutableStyle)
return false;
Modified: trunk/Source/WebCore/editing/EditingStyle.h (164302 => 164303)
--- trunk/Source/WebCore/editing/EditingStyle.h 2014-02-18 20:05:42 UTC (rev 164302)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2014-02-18 20:13:16 UTC (rev 164303)
@@ -135,7 +135,7 @@
void removeStyleFromRulesAndContext(StyledElement*, Node* context);
void removePropertiesInElementDefaultStyle(Element*);
void forceInline();
- bool convertFixedAndStickyPosition();
+ bool convertPositionStyle();
int legacyFontSize(Document*) const;
float fontSizeDelta() const { return m_fontSizeDelta; }
Modified: trunk/Source/WebCore/editing/markup.cpp (164302 => 164303)
--- trunk/Source/WebCore/editing/markup.cpp 2014-02-18 20:05:42 UTC (rev 164302)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-02-18 20:13:16 UTC (rev 164303)
@@ -328,7 +328,7 @@
newInlineStyle->forceInline();
if (m_needsPositionStyleConversion)
- m_needRelativeStyleWrapper |= newInlineStyle->convertFixedAndStickyPosition();
+ m_needRelativeStyleWrapper |= newInlineStyle->convertPositionStyle();
// If the node is not fully selected by the range, then we don't want to keep styles that affect its relationship to the nodes around it
// only the ones that affect it and the nodes within it.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
