<!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>[196430] 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/196430">196430</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-02-11 12:33:32 -0800 (Thu, 11 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Rename Element::style() to Element::cssomStyle()
https://bugs.webkit.org/show_bug.cgi?id=154107

Reviewed by Alex Christensen.

It implements the IDL &quot;style&quot; attribute that returns a CSSOM object.
Inside WebCore &quot;style&quot; generally refers to a RenderStyle.

* dom/Element.cpp:
(WebCore::Element::hasAttributeNS):
(WebCore::Element::cssomStyle):
(WebCore::Element::focus):
(WebCore::Element::style): Deleted.
* dom/Element.h:
(WebCore::Element::tagQName):
* dom/Element.idl:
* dom/StyledElement.cpp:
(WebCore::StyledElement::~StyledElement):
(WebCore::StyledElement::cssomStyle):
(WebCore::StyledElement::style): Deleted.
* dom/StyledElement.h:
(WebCore::StyledElement::synchronizeStyleAttributeInternal):
(WebCore::StyledElement::collectStyleForPresentationAttribute):
* editing/Editor.cpp:
(WebCore::Editor::applyEditingStyleToElement):
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getMatchedStylesForNode):
(WebCore::InspectorCSSAgent::getInlineStylesForNode):
(WebCore::InspectorCSSAgent::asInspectorStyleSheet):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheetForInlineStyle::didModifyElementAttribute):
(WebCore::InspectorStyleSheetForInlineStyle::inlineStyle):
(WebCore::InspectorStyleSheetForInlineStyle::elementStyleText):
* svg/SVGElement.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementh">trunk/Source/WebCore/dom/StyledElement.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveCSSPropertyCommandcpp">trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementidl">trunk/Source/WebCore/svg/SVGElement.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/ChangeLog        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-02-11  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Rename Element::style() to Element::cssomStyle()
+        https://bugs.webkit.org/show_bug.cgi?id=154107
+
+        Reviewed by Alex Christensen.
+
+        It implements the IDL &quot;style&quot; attribute that returns a CSSOM object.
+        Inside WebCore &quot;style&quot; generally refers to a RenderStyle.
+
+        * dom/Element.cpp:
+        (WebCore::Element::hasAttributeNS):
+        (WebCore::Element::cssomStyle):
+        (WebCore::Element::focus):
+        (WebCore::Element::style): Deleted.
+        * dom/Element.h:
+        (WebCore::Element::tagQName):
+        * dom/Element.idl:
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::~StyledElement):
+        (WebCore::StyledElement::cssomStyle):
+        (WebCore::StyledElement::style): Deleted.
+        * dom/StyledElement.h:
+        (WebCore::StyledElement::synchronizeStyleAttributeInternal):
+        (WebCore::StyledElement::collectStyleForPresentationAttribute):
+        * editing/Editor.cpp:
+        (WebCore::Editor::applyEditingStyleToElement):
+        * inspector/InspectorCSSAgent.cpp:
+        (WebCore::InspectorCSSAgent::getMatchedStylesForNode):
+        (WebCore::InspectorCSSAgent::getInlineStylesForNode):
+        (WebCore::InspectorCSSAgent::asInspectorStyleSheet):
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheetForInlineStyle::didModifyElementAttribute):
+        (WebCore::InspectorStyleSheetForInlineStyle::inlineStyle):
+        (WebCore::InspectorStyleSheetForInlineStyle::elementStyleText):
+        * svg/SVGElement.idl:
+
</ins><span class="cx"> 2016-02-11  Konstantin Tokarev  &lt;annulen@yandex.ru&gt;
</span><span class="cx"> 
</span><span class="cx">         [cmake] Consolidate TextureMapper file and include dir lists.
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/dom/Element.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -2227,9 +2227,9 @@
</span><span class="cx">     return elementData()-&gt;findAttributeByName(qName);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-CSSStyleDeclaration *Element::style()
</del><ins>+CSSStyleDeclaration* Element::cssomStyle()
</ins><span class="cx"> {
</span><del>-    return 0;
</del><ins>+    return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Element::focus(bool restorePreviousSelection, FocusDirection direction)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/dom/Element.h        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> 
</span><span class="cx">     const Vector&lt;RefPtr&lt;Attr&gt;&gt;&amp; attrNodeList();
</span><span class="cx"> 
</span><del>-    virtual CSSStyleDeclaration* style();
</del><ins>+    virtual CSSStyleDeclaration* cssomStyle();
</ins><span class="cx"> 
</span><span class="cx">     const QualifiedName&amp; tagQName() const { return m_tagName; }
</span><span class="cx"> #if ENABLE(CSS_SELECTOR_JIT)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/dom/Element.idl        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">     [ObjCLegacyUnnamedParameters] boolean hasAttributeNS([TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString namespaceURI,
</span><span class="cx">                                           [Default=Undefined] optional DOMString localName);
</span><span class="cx"> 
</span><del>-    readonly attribute CSSStyleDeclaration style;
</del><ins>+    [ImplementedAs=cssomStyle] readonly attribute CSSStyleDeclaration style;
</ins><span class="cx"> 
</span><span class="cx">     // DOM 4
</span><span class="cx"> #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/dom/StyledElement.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">         cssomWrapper-&gt;clearParentElement();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-CSSStyleDeclaration* StyledElement::style()
</del><ins>+CSSStyleDeclaration* StyledElement::cssomStyle()
</ins><span class="cx"> {
</span><span class="cx">     return ensureMutableInlineStyle().ensureInlineCSSStyleDeclaration(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.h (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.h        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/dom/StyledElement.h        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">     static void synchronizeStyleAttributeInternal(StyledElement*);
</span><span class="cx">     void synchronizeStyleAttributeInternal() const { StyledElement::synchronizeStyleAttributeInternal(const_cast&lt;StyledElement*&gt;(this)); }
</span><span class="cx">     
</span><del>-    virtual CSSStyleDeclaration* style() override final;
</del><ins>+    virtual CSSStyleDeclaration* cssomStyle() override final;
</ins><span class="cx"> 
</span><span class="cx">     const StyleProperties* presentationAttributeStyle();
</span><span class="cx">     virtual void collectStyleForPresentationAttribute(const QualifiedName&amp;, const AtomicString&amp;, MutableStyleProperties&amp;) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/editing/Editor.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -3071,7 +3071,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // Mutate using the CSSOM wrapper so we get the same event behavior as a script.
</span><del>-    CSSStyleDeclaration* style = downcast&lt;StyledElement&gt;(*element).style();
</del><ins>+    CSSStyleDeclaration* style = downcast&lt;StyledElement&gt;(*element).cssomStyle();
</ins><span class="cx">     style-&gt;setPropertyInternal(CSSPropertyWordWrap, &quot;break-word&quot;, false, IGNORE_EXCEPTION);
</span><span class="cx">     style-&gt;setPropertyInternal(CSSPropertyWebkitNbspMode, &quot;space&quot;, false, IGNORE_EXCEPTION);
</span><span class="cx">     style-&gt;setPropertyInternal(CSSPropertyWebkitLineBreak, &quot;after-white-space&quot;, false, IGNORE_EXCEPTION);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveCSSPropertyCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx"> 
</span><span class="cx">     // Mutate using the CSSOM wrapper so we get the same event behavior as a script.
</span><span class="cx">     // Setting to null string removes the property. We don't have internal version of removeProperty.
</span><del>-    m_element-&gt;style()-&gt;setPropertyInternal(m_property, String(), false, IGNORE_EXCEPTION);
</del><ins>+    m_element-&gt;cssomStyle()-&gt;setPropertyInternal(m_property, String(), false, IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RemoveCSSPropertyCommand::doUnapply()
</span><span class="cx"> {
</span><del>-    m_element-&gt;style()-&gt;setPropertyInternal(m_property, m_oldValue, m_important, IGNORE_EXCEPTION);
</del><ins>+    m_element-&gt;cssomStyle()-&gt;setPropertyInternal(m_property, m_oldValue, m_important, IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -556,9 +556,9 @@
</span><span class="cx"> 
</span><span class="cx">             // Mutate using the CSSOM wrapper so we get the same event behavior as a script.
</span><span class="cx">             if (isBlock(element))
</span><del>-                element-&gt;style()-&gt;setPropertyInternal(CSSPropertyDisplay, &quot;inline&quot;, false, IGNORE_EXCEPTION);
</del><ins>+                element-&gt;cssomStyle()-&gt;setPropertyInternal(CSSPropertyDisplay, &quot;inline&quot;, false, IGNORE_EXCEPTION);
</ins><span class="cx">             if (element-&gt;renderer() &amp;&amp; element-&gt;renderer()-&gt;style().isFloating())
</span><del>-                element-&gt;style()-&gt;setPropertyInternal(CSSPropertyFloat, &quot;none&quot;, false, IGNORE_EXCEPTION);
</del><ins>+                element-&gt;cssomStyle()-&gt;setPropertyInternal(CSSPropertyFloat, &quot;none&quot;, false, IGNORE_EXCEPTION);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx">                 auto entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
</span><span class="cx">                     .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement, NOPSEUDO))
</span><span class="cx">                     .release();
</span><del>-                if (parentElement-&gt;style() &amp;&amp; parentElement-&gt;style()-&gt;length()) {
</del><ins>+                if (parentElement-&gt;cssomStyle() &amp;&amp; parentElement-&gt;cssomStyle()-&gt;length()) {
</ins><span class="cx">                     if (InspectorStyleSheetForInlineStyle* styleSheet = asInspectorStyleSheet(parentElement))
</span><span class="cx">                         entry-&gt;setInlineStyle(styleSheet-&gt;buildObjectForStyle(styleSheet-&gt;styleForId(InspectorCSSId(styleSheet-&gt;id(), 0))));
</span><span class="cx">                 }
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">     if (!styleSheet)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    inlineStyle = styleSheet-&gt;buildObjectForStyle(element-&gt;style());
</del><ins>+    inlineStyle = styleSheet-&gt;buildObjectForStyle(element-&gt;cssomStyle());
</ins><span class="cx">     RefPtr&lt;Inspector::Protocol::CSS::CSSStyle&gt; attributes = buildObjectForAttributesStyle(element);
</span><span class="cx">     attributesStyle = attributes ? attributes.release() : nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> {
</span><span class="cx">     NodeToInspectorStyleSheet::iterator it = m_nodeToInspectorStyleSheet.find(element);
</span><span class="cx">     if (it == m_nodeToInspectorStyleSheet.end()) {
</span><del>-        CSSStyleDeclaration* style = element-&gt;isStyledElement() ? element-&gt;style() : nullptr;
</del><ins>+        CSSStyleDeclaration* style = element-&gt;cssomStyle();
</ins><span class="cx">         if (!style)
</span><span class="cx">             return nullptr;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -1277,7 +1277,7 @@
</span><span class="cx"> void InspectorStyleSheetForInlineStyle::didModifyElementAttribute()
</span><span class="cx"> {
</span><span class="cx">     m_isStyleTextValid = false;
</span><del>-    if (m_element-&gt;isStyledElement() &amp;&amp; m_element-&gt;style() != m_inspectorStyle-&gt;cssStyle())
</del><ins>+    if (m_element-&gt;isStyledElement() &amp;&amp; m_element-&gt;cssomStyle() != m_inspectorStyle-&gt;cssStyle())
</ins><span class="cx">         m_inspectorStyle = InspectorStyle::create(InspectorCSSId(id(), 0), inlineStyle(), this);
</span><span class="cx">     m_ruleSourceData = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1346,7 +1346,7 @@
</span><span class="cx"> 
</span><span class="cx"> CSSStyleDeclaration* InspectorStyleSheetForInlineStyle::inlineStyle() const
</span><span class="cx"> {
</span><del>-    return m_element-&gt;style();
</del><ins>+    return m_element-&gt;cssomStyle();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const String&amp; InspectorStyleSheetForInlineStyle::elementStyleText() const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.idl (196429 => 196430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.idl        2016-02-11 19:52:22 UTC (rev 196429)
+++ trunk/Source/WebCore/svg/SVGElement.idl        2016-02-11 20:33:32 UTC (rev 196430)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">     attribute DOMString xmlspace;
</span><span class="cx"> 
</span><span class="cx">     readonly attribute SVGAnimatedString className;
</span><del>-    readonly attribute CSSStyleDeclaration style;
</del><ins>+    [ImplementedAs=cssomStyle] readonly attribute CSSStyleDeclaration style;
</ins><span class="cx"> 
</span><span class="cx">     attribute long tabIndex;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>