<!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>[174329] 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/174329">174329</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-05 15:14:47 -0700 (Sun, 05 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for ElementData subclasses
https://bugs.webkit.org/show_bug.cgi?id=137430
Reviewed by Benjamin Poulain.
Use is<>() / downcast<>() for ElementData subclasses.
No new tests, no behavior change.
* dom/Element.cpp:
(WebCore::Element::cloneAttributesFromElement):
(WebCore::Element::createUniqueElementData):
* dom/ElementData.cpp:
(WebCore::ElementData::destroy):
* dom/ElementData.h:
(WebCore::ElementData::length):
(WebCore::ElementData::attributeBase):
(WebCore::ElementData::presentationAttributeStyle):
(WebCore::ElementData::attributesIterator):
(WebCore::ElementData::findAttributeByName):
(isType):</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="#trunkSourceWebCoredomElementDatacpp">trunk/Source/WebCore/dom/ElementData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementDatah">trunk/Source/WebCore/dom/ElementData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174328 => 174329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-05 11:28:30 UTC (rev 174328)
+++ trunk/Source/WebCore/ChangeLog 2014-10-05 22:14:47 UTC (rev 174329)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-10-05 Christophe Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for ElementData subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137430
+
+ Reviewed by Benjamin Poulain.
+
+ Use is<>() / downcast<>() for ElementData subclasses.
+
+ No new tests, no behavior change.
+
+ * dom/Element.cpp:
+ (WebCore::Element::cloneAttributesFromElement):
+ (WebCore::Element::createUniqueElementData):
+ * dom/ElementData.cpp:
+ (WebCore::ElementData::destroy):
+ * dom/ElementData.h:
+ (WebCore::ElementData::length):
+ (WebCore::ElementData::attributeBase):
+ (WebCore::ElementData::presentationAttributeStyle):
+ (WebCore::ElementData::attributesIterator):
+ (WebCore::ElementData::findAttributeByName):
+ (isType):
+
</ins><span class="cx"> 2014-10-05 Lorenzo Tilve <ltilve@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix build when DRAG_SUPPORT is disabled
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (174328 => 174329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-10-05 11:28:30 UTC (rev 174328)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-10-05 22:14:47 UTC (rev 174329)
</span><span class="lines">@@ -2938,10 +2938,10 @@
</span><span class="cx">
</span><span class="cx"> // If 'other' has a mutable ElementData, convert it to an immutable one so we can share it between both elements.
</span><span class="cx"> // We can only do this if there is no CSSOM wrapper for other's inline style, and there are no presentation attributes.
</span><del>- if (other.m_elementData->isUnique()
</del><ins>+ if (is<UniqueElementData>(*other.m_elementData)
</ins><span class="cx"> && !other.m_elementData->presentationAttributeStyle()
</span><span class="cx"> && (!other.m_elementData->inlineStyle() || !other.m_elementData->inlineStyle()->hasCSSOMWrapper()))
</span><del>- const_cast<Element&>(other).m_elementData = toUniqueElementData(other.m_elementData)->makeShareableCopy();
</del><ins>+ const_cast<Element&>(other).m_elementData = downcast<UniqueElementData>(*other.m_elementData).makeShareableCopy();
</ins><span class="cx">
</span><span class="cx"> if (!other.m_elementData->isUnique())
</span><span class="cx"> m_elementData = other.m_elementData;
</span><span class="lines">@@ -2963,7 +2963,7 @@
</span><span class="cx"> if (!m_elementData)
</span><span class="cx"> m_elementData = UniqueElementData::create();
</span><span class="cx"> else
</span><del>- m_elementData = toShareableElementData(m_elementData)->makeUniqueCopy();
</del><ins>+ m_elementData = downcast<ShareableElementData>(*m_elementData).makeUniqueCopy();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Element::hasPendingResources() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.cpp (174328 => 174329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.cpp 2014-10-05 11:28:30 UTC (rev 174328)
+++ trunk/Source/WebCore/dom/ElementData.cpp 2014-10-05 22:14:47 UTC (rev 174329)
</span><span class="lines">@@ -35,10 +35,10 @@
</span><span class="cx">
</span><span class="cx"> void ElementData::destroy()
</span><span class="cx"> {
</span><del>- if (isUnique())
- delete toUniqueElementData(this);
</del><ins>+ if (is<UniqueElementData>(*this))
+ delete downcast<UniqueElementData>(this);
</ins><span class="cx"> else
</span><del>- delete toShareableElementData(this);
</del><ins>+ delete downcast<ShareableElementData>(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ElementData::ElementData()
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.h (174328 => 174329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.h 2014-10-05 11:28:30 UTC (rev 174328)
+++ trunk/Source/WebCore/dom/ElementData.h 2014-10-05 22:14:47 UTC (rev 174329)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "Attribute.h"
</span><span class="cx"> #include "SpaceSplitString.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -181,10 +182,6 @@
</span><span class="cx"> PassRef<UniqueElementData> makeUniqueCopy() const;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define ELEMENT_DATA_TYPE_CASTS(ToValueTypeName, pointerPredicate, referencePredicate) \
- template<typename T> inline ToValueTypeName* to##ToValueTypeName(const RefPtr<T>& elementData) { return to##ToValueTypeName(elementData.get()); } \
- TYPE_CASTS_BASE(ToValueTypeName, ElementData, elementData, pointerPredicate, referencePredicate)
-
</del><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> #pragma warning(push)
</span><span class="cx"> #pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
</span><span class="lines">@@ -203,8 +200,6 @@
</span><span class="cx"> Attribute m_attributeArray[0];
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ELEMENT_DATA_TYPE_CASTS(ShareableElementData, !elementData->isUnique(), !elementData.isUnique())
-
</del><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> #pragma warning(pop)
</span><span class="cx"> #endif
</span><span class="lines">@@ -232,8 +227,6 @@
</span><span class="cx"> AttributeVector m_attributeVector;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ELEMENT_DATA_TYPE_CASTS(UniqueElementData, elementData->isUnique(), elementData.isUnique())
-
</del><span class="cx"> inline void ElementData::deref()
</span><span class="cx"> {
</span><span class="cx"> if (!derefBase())
</span><span class="lines">@@ -243,32 +236,32 @@
</span><span class="cx">
</span><span class="cx"> inline unsigned ElementData::length() const
</span><span class="cx"> {
</span><del>- if (isUnique())
- return toUniqueElementData(this)->m_attributeVector.size();
</del><ins>+ if (is<UniqueElementData>(*this))
+ return downcast<UniqueElementData>(*this).m_attributeVector.size();
</ins><span class="cx"> return arraySize();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline const Attribute* ElementData::attributeBase() const
</span><span class="cx"> {
</span><del>- if (isUnique())
- return toUniqueElementData(this)->m_attributeVector.data();
- return toShareableElementData(this)->m_attributeArray;
</del><ins>+ if (is<UniqueElementData>(*this))
+ return downcast<UniqueElementData>(*this).m_attributeVector.data();
+ return downcast<ShareableElementData>(*this).m_attributeArray;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline const StyleProperties* ElementData::presentationAttributeStyle() const
</span><span class="cx"> {
</span><del>- if (!isUnique())
- return 0;
- return toUniqueElementData(this)->m_presentationAttributeStyle.get();
</del><ins>+ if (!is<UniqueElementData>(*this))
+ return nullptr;
+ return downcast<UniqueElementData>(*this).m_presentationAttributeStyle.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline AttributeIteratorAccessor ElementData::attributesIterator() const
</span><span class="cx"> {
</span><del>- if (isUnique()) {
- const Vector<Attribute, 4>& attributeVector = toUniqueElementData(this)->m_attributeVector;
</del><ins>+ if (is<UniqueElementData>(*this)) {
+ const Vector<Attribute, 4>& attributeVector = downcast<UniqueElementData>(*this).m_attributeVector;
</ins><span class="cx"> return AttributeIteratorAccessor(attributeVector.data(), attributeVector.size());
</span><span class="cx"> }
</span><del>- return AttributeIteratorAccessor(toShareableElementData(this)->m_attributeArray, arraySize());
</del><ins>+ return AttributeIteratorAccessor(downcast<ShareableElementData>(*this).m_attributeArray, arraySize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE const Attribute* ElementData::findAttributeByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const
</span><span class="lines">@@ -276,7 +269,7 @@
</span><span class="cx"> unsigned index = findAttributeIndexByName(name, shouldIgnoreAttributeCase);
</span><span class="cx"> if (index != attributeNotFound)
</span><span class="cx"> return &attributeAt(index);
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE unsigned ElementData::findAttributeIndexByName(const QualifiedName& name) const
</span><span class="lines">@@ -342,7 +335,15 @@
</span><span class="cx"> return m_attributeVector.at(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ShareableElementData)
+ static bool isType(const WebCore::ElementData& elementData) { return !elementData.isUnique(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::UniqueElementData)
+ static bool isType(const WebCore::ElementData& elementData) { return elementData.isUnique(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // ElementData_h
+
</ins></span></pre>
</div>
</div>
</body>
</html>