Changeset 125159 in webkit

Timestamp:

Aug 9, 2012 12:47:55 AM (12 years ago)

Author:

arko@motorola.com

Message:

Microdata: PropertyNodeList cache should be invalidated on id attribute change.
​https://bugs.webkit.org/show_bug.cgi?id=93485

Reviewed by Ryosuke Niwa.

Source/WebCore:

Invalidate PropertyNodeList cache when id attribute of an element changed/modified.

Test: fast/dom/MicroData/propertiescollection-on-changing-id-attr.html

• dom/DynamicNodeList.cpp: Moved ownerNodeHasItemRefAttribute() method to DynamicNodeList.h

(WebCore):

• dom/DynamicNodeList.h:

(WebCore):
(WebCore::DynamicNodeListCacheBase::isRootedAtDocument): Return true if owner has itemref
attribute specified with root type NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr.
(WebCore::DynamicNodeListCacheBase::shouldInvalidateTypeOnAttributeChange): Return true if
attrName is id attribute in case of InvalidateOnItemAttrChange.
(WebCore::DynamicNodeListCacheBase::ownerNodeHasItemRefAttribute):

LayoutTests:

Added test to verify HTMLPropertiesCollection and PropertyNodeList interfaces
behavior on changing id attribute.

• fast/dom/MicroData/propertiescollection-on-changing-id-attr-expected.txt: Added.
• fast/dom/MicroData/propertiescollection-on-changing-id-attr.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/MicroData/propertiescollection-on-changing-id-attr-expected.txt (added)
• LayoutTests/fast/dom/MicroData/propertiescollection-on-changing-id-attr.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/DynamicNodeList.cpp (modified) (1 diff)
• Source/WebCore/dom/DynamicNodeList.h (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-08  Arko Saha  <arko@motorola.com>
+
+        Microdata: PropertyNodeList cache should be invalidated on id attribute change.
+        https://bugs.webkit.org/show_bug.cgi?id=93485
+
+        Reviewed by Ryosuke Niwa.
+
+        Added test to verify HTMLPropertiesCollection and PropertyNodeList interfaces
+        behavior on changing id attribute.
+
+        * fast/dom/MicroData/propertiescollection-on-changing-id-attr-expected.txt: Added.
+        * fast/dom/MicroData/propertiescollection-on-changing-id-attr.html: Added.
+
 2012-08-09  Takashi Toyoshima  <toyoshim@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-08  Arko Saha  <arko@motorola.com>
+
+        Microdata: PropertyNodeList cache should be invalidated on id attribute change.
+        https://bugs.webkit.org/show_bug.cgi?id=93485
+
+        Reviewed by Ryosuke Niwa.
+
+        Invalidate PropertyNodeList cache when id attribute of an element changed/modified.
+
+        Test: fast/dom/MicroData/propertiescollection-on-changing-id-attr.html
+
+        * dom/DynamicNodeList.cpp: Moved ownerNodeHasItemRefAttribute() method to DynamicNodeList.h
+        (WebCore):
+        * dom/DynamicNodeList.h:
+        (WebCore):
+        (WebCore::DynamicNodeListCacheBase::isRootedAtDocument): Return true if owner has itemref
+        attribute specified with root type NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr.
+        (WebCore::DynamicNodeListCacheBase::shouldInvalidateTypeOnAttributeChange): Return true if
+        attrName is id attribute in case of InvalidateOnItemAttrChange.
+        (WebCore::DynamicNodeListCacheBase::ownerNodeHasItemRefAttribute):
+
 2012-08-09  Arko Saha  <arko@motorola.com>
 

trunk/Source/WebCore/dom/DynamicNodeList.cpp

@@ -48 +48 @@
 
     return m_ownerNode.get();
-}
-
-ALWAYS_INLINE bool DynamicNodeListCacheBase::ownerNodeHasItemRefAttribute() const
-{
-#if ENABLE(MICRODATA)
-    if (m_rootType == NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr)
-        return toElement(ownerNode())->fastHasAttribute(HTMLNames::itemrefAttr);
-#endif
-
-    return false;
 }
 

trunk/Source/WebCore/dom/DynamicNodeList.h

@@ -27 +27 @@
 #include "CollectionType.h"
 #include "Document.h"
+#include "Element.h"
 #include "HTMLNames.h"
 #include "NodeList.h"
@@ -33 +34 @@
 
 namespace WebCore {
-
-class Element;
-class Node;
 
 enum NodeListRootType {
@@ -71 +69 @@
 
 public:
-    ALWAYS_INLINE bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument; }
+    ALWAYS_INLINE bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument || ownerNodeHasItemRefAttribute(); }
     ALWAYS_INLINE NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
     ALWAYS_INLINE CollectionType type() const { return static_cast<CollectionType>(m_collectionType); }
@@ -167 +165 @@
     case InvalidateOnItemAttrChange:
 #if ENABLE(MICRODATA)
-        return attrName == HTMLNames::itemscopeAttr || attrName == HTMLNames::itempropAttr || attrName == HTMLNames::itemtypeAttr || attrName == HTMLNames::itemrefAttr;
+        return attrName == HTMLNames::itemscopeAttr || attrName == HTMLNames::itempropAttr
+            || attrName == HTMLNames::itemtypeAttr || attrName == HTMLNames::itemrefAttr || attrName == HTMLNames::idAttr;
 #endif // Intentionally fall through
     case DoNotInvalidateOnAttributeChanges:
@@ -174 +173 @@
         return true;
     }
+    return false;
+}
+
+ALWAYS_INLINE bool DynamicNodeListCacheBase::ownerNodeHasItemRefAttribute() const
+{
+#if ENABLE(MICRODATA)
+    if (m_rootType == NodeListIsRootedAtDocumentIfOwnerHasItemrefAttr)
+        return toElement(ownerNode())->fastHasAttribute(HTMLNames::itemrefAttr);
+#endif
+
     return false;
 }