Modified: trunk/Source/WebCore/ChangeLog (121334 => 121335)
--- trunk/Source/WebCore/ChangeLog 2012-06-27 09:44:31 UTC (rev 121334)
+++ trunk/Source/WebCore/ChangeLog 2012-06-27 10:21:55 UTC (rev 121335)
@@ -1,3 +1,55 @@
+2012-06-27 Kentaro Hara <hara...@chromium.org>
+
+ Rename Element::rareData() to Element::elementRareData(), and Element::ensureRareData() to Element::ensureElementRareData()
+ https://bugs.webkit.org/show_bug.cgi?id=90050
+
+ Reviewed by Ryosuke Niwa.
+
+ Element::rareData()/Element::ensureRareData() and
+ Node::rareData()/Node::ensureRareData() are confusing. They are not virtual
+ methods. For clarification, we can rename Element::rareData() to
+ Element::elementRareData(), and Element::ensureRareData() to
+ Element::ensureElementRareData().
+
+ c.f. SVGRareData uses SVGElement::rareSVGData() and SVGElement::ensureRareSVGData().
+ (We might want to rename them to SVGElement::svgRareData() and
+ SVGElement::ensureSVGRareData() in a follow-up patch.)
+
+ No tests. No change in behavior.
+
+ * dom/Element.cpp:
+ (WebCore::Element::~Element):
+ (WebCore::Element::elementRareData):
+ (WebCore::Element::ensureElementRareData):
+ (WebCore::Element::attributes):
+ (WebCore::Element::attach):
+ (WebCore::Element::detach):
+ (WebCore::Element::recalcStyle):
+ (WebCore::Element::shadow):
+ (WebCore::Element::ensureShadow):
+ (WebCore::Element::shadowPseudoId):
+ (WebCore::Element::setShadowPseudoId):
+ (WebCore::Element::focus):
+ (WebCore::Element::minimumSizeForResizing):
+ (WebCore::Element::setMinimumSizeForResizing):
+ (WebCore::Element::computedStyle):
+ (WebCore::Element::setStyleAffectedByEmpty):
+ (WebCore::Element::styleAffectedByEmpty):
+ (WebCore::Element::cancelFocusAppearanceUpdate):
+ (WebCore::Element::classList):
+ (WebCore::Element::optionalClassList):
+ (WebCore::Element::dataset):
+ (WebCore::Element::containsFullScreenElement):
+ (WebCore::Element::setContainsFullScreenElement):
+ (WebCore::Element::hasNamedNodeMap):
+ (WebCore::Element::ensureCachedHTMLCollection):
+ (WebCore::Element::savedLayerScrollOffset):
+ (WebCore::Element::setSavedLayerScrollOffset):
+ * dom/Element.h:
+ (Element):
+ * html/LabelableElement.cpp:
+ (WebCore::LabelableElement::labels):
+
2012-06-26 Dominic Cooney <domin...@chromium.org>
[Chromium] Remove unused build scripts and empty folders for _javascript_Core w/ gyp
Modified: trunk/Source/WebCore/dom/Element.cpp (121334 => 121335)
--- trunk/Source/WebCore/dom/Element.cpp 2012-06-27 09:44:31 UTC (rev 121334)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-06-27 10:21:55 UTC (rev 121335)
@@ -137,7 +137,7 @@
if (ElementShadow* elementShadow = shadow()) {
elementShadow->removeAllShadowRoots();
- rareData()->m_shadow.clear();
+ elementRareData()->m_shadow.clear();
}
if (hasAttrList()) {
@@ -146,15 +146,15 @@
}
}
-inline ElementRareData* Element::rareData() const
+inline ElementRareData* Element::elementRareData() const
{
ASSERT(hasRareData());
return static_cast<ElementRareData*>(NodeRareData::rareDataFromMap(this));
}
-inline ElementRareData* Element::ensureRareData()
+inline ElementRareData* Element::ensureElementRareData()
{
- return static_cast<ElementRareData*>(Node::ensureRareData());
+ return static_cast<ElementRareData*>(ensureRareData());
}
OwnPtr<NodeRareData> Element::createRareData()
@@ -234,7 +234,7 @@
NamedNodeMap* Element::attributes() const
{
ensureUpdatedAttributeData();
- ElementRareData* rareData = const_cast<Element*>(this)->ensureRareData();
+ ElementRareData* rareData = const_cast<Element*>(this)->ensureElementRareData();
if (NamedNodeMap* attributeMap = rareData->m_attributeMap.get())
return attributeMap;
@@ -948,7 +948,7 @@
}
if (hasRareData()) {
- ElementRareData* data = ""
+ ElementRareData* data = ""
if (data->needsFocusAppearanceUpdateSoonAfterAttach()) {
if (isFocusable() && document()->focusedNode() == this)
document()->updateFocusAppearanceSoon(false /* don't restore selection */);
@@ -974,7 +974,7 @@
unregisterNamedFlowContentNode();
cancelFocusAppearanceUpdate();
if (hasRareData())
- rareData()->resetComputedStyle();
+ elementRareData()->resetComputedStyle();
if (ElementShadow* shadow = this->shadow()) {
detachChildrenIfNeeded();
@@ -1048,7 +1048,7 @@
if ((change > NoChange || needsStyleRecalc())) {
if (hasRareData()) {
- ElementRareData* data = ""
+ ElementRareData* data = ""
data->resetComputedStyle();
data->m_styleAffectedByEmpty = false;
}
@@ -1162,16 +1162,16 @@
if (!hasRareData())
return 0;
- return rareData()->m_shadow.get();
+ return elementRareData()->m_shadow.get();
}
ElementShadow* Element::ensureShadow()
{
- if (ElementShadow* shadow = ensureRareData()->m_shadow.get())
+ if (ElementShadow* shadow = ensureElementRareData()->m_shadow.get())
return shadow;
- rareData()->m_shadow = adoptPtr(new ElementShadow());
- return rareData()->m_shadow.get();
+ elementRareData()->m_shadow = adoptPtr(new ElementShadow());
+ return elementRareData()->m_shadow.get();
}
ShadowRoot* Element::ensureShadowRoot()
@@ -1184,7 +1184,7 @@
const AtomicString& Element::shadowPseudoId() const
{
- return hasRareData() ? rareData()->m_shadowPseudoId : nullAtom;
+ return hasRareData() ? elementRareData()->m_shadowPseudoId : nullAtom;
}
void Element::setShadowPseudoId(const AtomicString& id, ExceptionCode& ec)
@@ -1197,7 +1197,7 @@
return;
}
- ensureRareData()->m_shadowPseudoId = id;
+ ensureElementRareData()->m_shadowPseudoId = id;
}
bool Element::childTypeAllowed(NodeType type) const
@@ -1554,7 +1554,7 @@
doc->updateLayoutIgnorePendingStylesheets();
if (!isFocusable()) {
- ensureRareData()->setNeedsFocusAppearanceUpdateSoonAfterAttach(true);
+ ensureElementRareData()->setNeedsFocusAppearanceUpdateSoonAfterAttach(true);
return;
}
@@ -1624,14 +1624,14 @@
LayoutSize Element::minimumSizeForResizing() const
{
- return hasRareData() ? rareData()->m_minimumSizeForResizing : defaultMinimumSizeForResizing();
+ return hasRareData() ? elementRareData()->m_minimumSizeForResizing : defaultMinimumSizeForResizing();
}
void Element::setMinimumSizeForResizing(const LayoutSize& size)
{
if (size == defaultMinimumSizeForResizing() && !hasRareData())
return;
- ensureRareData()->m_minimumSizeForResizing = size;
+ ensureElementRareData()->m_minimumSizeForResizing = size;
}
RenderStyle* Element::computedStyle(PseudoId pseudoElementSpecifier)
@@ -1652,7 +1652,7 @@
// document tree and figure out when to destroy the computed style for such elements.
return 0;
- ElementRareData* data = ""
+ ElementRareData* data = ""
if (!data->m_computedStyle)
data->m_computedStyle = document()->styleForElementIgnoringPendingStylesheets(this);
return pseudoElementSpecifier ? data->m_computedStyle->getCachedPseudoStyle(pseudoElementSpecifier) : data->m_computedStyle.get();
@@ -1660,13 +1660,13 @@
void Element::setStyleAffectedByEmpty()
{
- ElementRareData* data = ""
+ ElementRareData* data = ""
data->m_styleAffectedByEmpty = true;
}
bool Element::styleAffectedByEmpty() const
{
- return hasRareData() && rareData()->m_styleAffectedByEmpty;
+ return hasRareData() && elementRareData()->m_styleAffectedByEmpty;
}
AtomicString Element::computeInheritedLanguage() const
@@ -1694,7 +1694,7 @@
void Element::cancelFocusAppearanceUpdate()
{
if (hasRareData())
- rareData()->setNeedsFocusAppearanceUpdateSoonAfterAttach(false);
+ elementRareData()->setNeedsFocusAppearanceUpdateSoonAfterAttach(false);
if (document()->focusedNode() == this)
document()->cancelFocusAppearanceUpdate();
}
@@ -1754,7 +1754,7 @@
DOMTokenList* Element::classList()
{
- ElementRareData* data = ""
+ ElementRareData* data = ""
if (!data->m_classList)
data->m_classList = ClassList::create(this);
return data->m_classList.get();
@@ -1764,12 +1764,12 @@
{
if (!hasRareData())
return 0;
- return rareData()->m_classList.get();
+ return elementRareData()->m_classList.get();
}
DOMStringMap* Element::dataset()
{
- ElementRareData* data = ""
+ ElementRareData* data = ""
if (!data->m_datasetDOMStringMap)
data->m_datasetDOMStringMap = DatasetDOMStringMap::create(this);
return data->m_datasetDOMStringMap.get();
@@ -1846,12 +1846,12 @@
bool Element::containsFullScreenElement() const
{
- return hasRareData() ? rareData()->m_containsFullScreenElement : false;
+ return hasRareData() ? elementRareData()->m_containsFullScreenElement : false;
}
void Element::setContainsFullScreenElement(bool flag)
{
- ensureRareData()->m_containsFullScreenElement = flag;
+ ensureElementRareData()->m_containsFullScreenElement = flag;
setNeedsStyleRecalc(SyntheticStyleChange);
}
@@ -1972,7 +1972,7 @@
#ifdef DUMP_NODE_STATISTICS
bool Element::hasNamedNodeMap() const
{
- return hasRareData() && rareData()->m_attributeMap;
+ return hasRareData() && elementRareData()->m_attributeMap;
}
#endif
@@ -2041,19 +2041,19 @@
HTMLCollection* Element::ensureCachedHTMLCollection(CollectionType type)
{
- return ensureRareData()->ensureCachedHTMLCollection(this, type);
+ return ensureElementRareData()->ensureCachedHTMLCollection(this, type);
}
IntSize Element::savedLayerScrollOffset() const
{
- return hasRareData() ? rareData()->m_savedLayerScrollOffset : IntSize();
+ return hasRareData() ? elementRareData()->m_savedLayerScrollOffset : IntSize();
}
void Element::setSavedLayerScrollOffset(const IntSize& size)
{
if (size.isZero() && !hasRareData())
return;
- ensureRareData()->m_savedLayerScrollOffset = size;
+ ensureElementRareData()->m_savedLayerScrollOffset = size;
}
PassRefPtr<Attr> Element::attrIfExists(const QualifiedName& name)
Modified: trunk/Source/WebCore/dom/Element.h (121334 => 121335)
--- trunk/Source/WebCore/dom/Element.h 2012-06-27 09:44:31 UTC (rev 121334)
+++ trunk/Source/WebCore/dom/Element.h 2012-06-27 10:21:55 UTC (rev 121335)
@@ -489,8 +489,8 @@
QualifiedName m_tagName;
virtual OwnPtr<NodeRareData> createRareData();
- ElementRareData* rareData() const;
- ElementRareData* ensureRareData();
+ ElementRareData* elementRareData() const;
+ ElementRareData* ensureElementRareData();
SpellcheckAttributeState spellcheckAttributeState() const;
Modified: trunk/Source/WebCore/html/LabelableElement.cpp (121334 => 121335)
--- trunk/Source/WebCore/html/LabelableElement.cpp 2012-06-27 09:44:31 UTC (rev 121334)
+++ trunk/Source/WebCore/html/LabelableElement.cpp 2012-06-27 10:21:55 UTC (rev 121335)
@@ -47,7 +47,7 @@
if (!document())
return 0;
- return Node::ensureRareData()->ensureNodeLists(this)->addCacheWithAtomicName<LabelsNodeList>(this, DynamicNodeList::LabelsNodeListType, starAtom);
+ return ensureRareData()->ensureNodeLists(this)->addCacheWithAtomicName<LabelsNodeList>(this, DynamicNodeList::LabelsNodeListType, starAtom);
}
} // namespace Webcore
