<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167967] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167967">167967</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-29 16:34:29 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move removeEquivalentProperties functions to EditingStyle
https://bugs.webkit.org/show_bug.cgi?id=131093
Patch by Zsolt Borbely <zsborbely.u-szeged@partner.samsung.com> on 2014-04-29
Reviewed by Darin Adler.
Moved the removeEquivalentProperties functions
from StyleProperties to EditingStyle class.
* css/StyleProperties.cpp:
(WebCore::MutableStyleProperties::removeEquivalentProperties): Deleted.
* css/StyleProperties.h:
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::removeStyleAddedByNode):
(WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode):
(WebCore::EditingStyle::prepareToApplyAt):
(WebCore::EditingStyle::removeEquivalentProperties):
(WebCore::extractPropertiesNotIn):
* editing/EditingStyle.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiesh">trunk/Source/WebCore/css/StyleProperties.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStyleh">trunk/Source/WebCore/editing/EditingStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167966 => 167967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-29 23:20:38 UTC (rev 167966)
+++ trunk/Source/WebCore/ChangeLog 2014-04-29 23:34:29 UTC (rev 167967)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-29 Zsolt Borbely <zsborbely.u-szeged@partner.samsung.com>
+
+ Move removeEquivalentProperties functions to EditingStyle
+ https://bugs.webkit.org/show_bug.cgi?id=131093
+
+ Reviewed by Darin Adler.
+
+ Moved the removeEquivalentProperties functions
+ from StyleProperties to EditingStyle class.
+
+ * css/StyleProperties.cpp:
+ (WebCore::MutableStyleProperties::removeEquivalentProperties): Deleted.
+ * css/StyleProperties.h:
+ * editing/EditingStyle.cpp:
+ (WebCore::EditingStyle::removeStyleAddedByNode):
+ (WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode):
+ (WebCore::EditingStyle::prepareToApplyAt):
+ (WebCore::EditingStyle::removeEquivalentProperties):
+ (WebCore::extractPropertiesNotIn):
+ * editing/EditingStyle.h:
+
</ins><span class="cx"> 2014-04-29 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Implement support for compositing
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (167966 => 167967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-29 23:20:38 UTC (rev 167966)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-29 23:34:29 UTC (rev 167967)
</span><span class="lines">@@ -1173,34 +1173,6 @@
</span><span class="cx"> return propertyAt(foundPropertyIndex).value()->equals(*propertyValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutableStyleProperties::removeEquivalentProperties(const StyleProperties* style)
-{
- Vector<CSSPropertyID> propertiesToRemove;
- unsigned size = m_propertyVector.size();
- for (unsigned i = 0; i < size; ++i) {
- PropertyReference property = propertyAt(i);
- if (style->propertyMatches(property.id(), property.value()))
- propertiesToRemove.append(property.id());
- }
- // FIXME: This should use mass removal.
- for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
- removeProperty(propertiesToRemove[i]);
-}
-
-void MutableStyleProperties::removeEquivalentProperties(const ComputedStyleExtractor* computedStyle)
-{
- Vector<CSSPropertyID> propertiesToRemove;
- unsigned size = m_propertyVector.size();
- for (unsigned i = 0; i < size; ++i) {
- PropertyReference property = propertyAt(i);
- if (computedStyle->propertyMatches(property.id(), property.value()))
- propertiesToRemove.append(property.id());
- }
- // FIXME: This should use mass removal.
- for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
- removeProperty(propertiesToRemove[i]);
-}
-
</del><span class="cx"> PassRef<MutableStyleProperties> StyleProperties::mutableCopy() const
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MutableStyleProperties(*this));
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.h (167966 => 167967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.h 2014-04-29 23:20:38 UTC (rev 167966)
+++ trunk/Source/WebCore/css/StyleProperties.h 2014-04-29 23:34:29 UTC (rev 167967)
</span><span class="lines">@@ -211,10 +211,6 @@
</span><span class="cx"> void removeBlockProperties();
</span><span class="cx"> bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
</span><span class="cx">
</span><del>- // FIXME: These two can be moved to EditingStyle.cpp
- void removeEquivalentProperties(const StyleProperties*);
- void removeEquivalentProperties(const ComputedStyleExtractor*);
-
</del><span class="cx"> void mergeAndOverrideOnConflict(const StyleProperties&);
</span><span class="cx">
</span><span class="cx"> void clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (167966 => 167967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2014-04-29 23:20:38 UTC (rev 167966)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2014-04-29 23:34:29 UTC (rev 167967)
</span><span class="lines">@@ -593,8 +593,8 @@
</span><span class="cx"> return;
</span><span class="cx"> RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
</span><span class="cx"> RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
</span><del>- nodeStyle->removeEquivalentProperties(parentStyle.get());
- m_mutableStyle->removeEquivalentProperties(nodeStyle.get());
</del><ins>+ removeEquivalentProperties(*parentStyle);
+ removeEquivalentProperties(*nodeStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EditingStyle::removeStyleConflictingWithStyleOfNode(Node* node)
</span><span class="lines">@@ -603,12 +603,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
</span><del>- RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
- nodeStyle->removeEquivalentProperties(parentStyle.get());
</del><ins>+ RefPtr<EditingStyle> nodeStyle = EditingStyle::create(node, EditingPropertiesInEffect);
+ nodeStyle->removeEquivalentProperties(*parentStyle);
</ins><span class="cx">
</span><del>- unsigned propertyCount = nodeStyle->propertyCount();
</del><ins>+ MutableStyleProperties* style = nodeStyle->style();
+ unsigned propertyCount = style->propertyCount();
</ins><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i)
</span><del>- m_mutableStyle->removeProperty(nodeStyle->propertyAt(i).id());
</del><ins>+ m_mutableStyle->removeProperty(style->propertyAt(i).id());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EditingStyle::collapseTextDecorationProperties()
</span><span class="lines">@@ -916,7 +917,7 @@
</span><span class="cx"> direction = m_mutableStyle->getPropertyCSSValue(CSSPropertyDirection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_mutableStyle->removeEquivalentProperties(styleAtPosition);
</del><ins>+ removeEquivalentProperties(*styleAtPosition);
</ins><span class="cx">
</span><span class="cx"> if (textAlignResolvingStartAndEnd(m_mutableStyle.get()) == textAlignResolvingStartAndEnd(styleAtPosition))
</span><span class="cx"> m_mutableStyle->removeProperty(CSSPropertyTextAlign);
</span><span class="lines">@@ -1191,6 +1192,19 @@
</span><span class="cx"> removePropertiesInStyle(m_mutableStyle.get(), defaultStyle.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T>
+void EditingStyle::removeEquivalentProperties(const T& style)
+{
+ Vector<CSSPropertyID> propertiesToRemove;
+ for (auto& property : m_mutableStyle->m_propertyVector) {
+ if (style.propertyMatches(property.id(), property.value()))
+ propertiesToRemove.append(property.id());
+ }
+ // FIXME: This should use mass removal.
+ for (auto& property : propertiesToRemove)
+ m_mutableStyle->removeProperty(property);
+}
+
</ins><span class="cx"> void EditingStyle::forceInline()
</span><span class="cx"> {
</span><span class="cx"> if (!m_mutableStyle)
</span><span class="lines">@@ -1542,28 +1556,28 @@
</span><span class="cx"> static PassRefPtr<MutableStyleProperties> extractPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(styleWithRedundantProperties);
</span><del>- RefPtr<MutableStyleProperties> result = styleWithRedundantProperties->mutableCopy();
</del><ins>+ RefPtr<EditingStyle> result = EditingStyle::create(styleWithRedundantProperties);
+ result->removeEquivalentProperties(*baseStyle);
+ RefPtr<MutableStyleProperties> mutableStyle = result->style();
</ins><span class="cx">
</span><del>- result->removeEquivalentProperties(baseStyle);
-
</del><span class="cx"> RefPtr<CSSValue> baseTextDecorationsInEffect = extractPropertyValue(baseStyle, CSSPropertyWebkitTextDecorationsInEffect);
</span><del>- diffTextDecorations(result.get(), CSSPropertyTextDecoration, baseTextDecorationsInEffect.get());
- diffTextDecorations(result.get(), CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect.get());
</del><ins>+ diffTextDecorations(mutableStyle.get(), CSSPropertyTextDecoration, baseTextDecorationsInEffect.get());
+ diffTextDecorations(mutableStyle.get(), CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect.get());
</ins><span class="cx">
</span><del>- if (extractPropertyValue(baseStyle, CSSPropertyFontWeight) && fontWeightIsBold(result.get()) == fontWeightIsBold(baseStyle))
- result->removeProperty(CSSPropertyFontWeight);
</del><ins>+ if (extractPropertyValue(baseStyle, CSSPropertyFontWeight) && fontWeightIsBold(mutableStyle.get()) == fontWeightIsBold(baseStyle))
+ mutableStyle->removeProperty(CSSPropertyFontWeight);
</ins><span class="cx">
</span><del>- if (extractPropertyValue(baseStyle, CSSPropertyColor) && textColorFromStyle(result.get()) == textColorFromStyle(baseStyle))
- result->removeProperty(CSSPropertyColor);
</del><ins>+ if (extractPropertyValue(baseStyle, CSSPropertyColor) && textColorFromStyle(mutableStyle.get()) == textColorFromStyle(baseStyle))
+ mutableStyle->removeProperty(CSSPropertyColor);
</ins><span class="cx">
</span><span class="cx"> if (extractPropertyValue(baseStyle, CSSPropertyTextAlign)
</span><del>- && textAlignResolvingStartAndEnd(result.get()) == textAlignResolvingStartAndEnd(baseStyle))
- result->removeProperty(CSSPropertyTextAlign);
</del><ins>+ && textAlignResolvingStartAndEnd(mutableStyle.get()) == textAlignResolvingStartAndEnd(baseStyle))
+ mutableStyle->removeProperty(CSSPropertyTextAlign);
</ins><span class="cx">
</span><del>- if (extractPropertyValue(baseStyle, CSSPropertyBackgroundColor) && backgroundColorFromStyle(result.get()) == backgroundColorFromStyle(baseStyle))
- result->removeProperty(CSSPropertyBackgroundColor);
</del><ins>+ if (extractPropertyValue(baseStyle, CSSPropertyBackgroundColor) && backgroundColorFromStyle(mutableStyle.get()) == backgroundColorFromStyle(baseStyle))
+ mutableStyle->removeProperty(CSSPropertyBackgroundColor);
</ins><span class="cx">
</span><del>- return result.release();
</del><ins>+ return mutableStyle.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.h (167966 => 167967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.h 2014-04-29 23:20:38 UTC (rev 167966)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2014-04-29 23:34:29 UTC (rev 167967)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> class CSSComputedStyleDeclaration;
</span><span class="cx"> class CSSPrimitiveValue;
</span><span class="cx"> class CSSValue;
</span><ins>+class ComputedStyleExtractor;
</ins><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><span class="cx"> class HTMLElement;
</span><span class="lines">@@ -108,6 +109,8 @@
</span><span class="cx"> void removeBlockProperties();
</span><span class="cx"> void removeStyleAddedByNode(Node*);
</span><span class="cx"> void removeStyleConflictingWithStyleOfNode(Node*);
</span><ins>+ template<typename T>
+ void removeEquivalentProperties(const T&);
</ins><span class="cx"> void collapseTextDecorationProperties();
</span><span class="cx"> enum ShouldIgnoreTextOnlyProperties { IgnoreTextOnlyProperties, DoNotIgnoreTextOnlyProperties };
</span><span class="cx"> TriState triStateOfStyle(EditingStyle*) const;
</span></span></pre>
</div>
</div>
</body>
</html>