Changeset 125371 in webkit

Timestamp:

Aug 12, 2012 4:38:09 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

webkit fails IETC namespaces/prefix-007.xml
​https://bugs.webkit.org/show_bug.cgi?id=86137

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-08-12
Reviewed by Eric Seidel.

Source/WebCore:

If a namespace prefix or default namespace is declared more than once
only the last declaration shall be used.

parseAddNamespace doesn't check return value of WTF::HashMap<>::add.
If the return value's isNewEntry is true, the new entry is added with
the specified value. However, if isNewEntry is false, it is required
to update the store value.

No new tests. ietestcenter/css3/namespaces/prefix-007.xml and
ietestcenter/css3/namespaces/prefix-010.xml covers this change.

• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::parserAddNamespace):
Modified to check m_namespaces.add's return value.
If the result says not a new entry, updated the value stored in
m_namespaces by using iterator in the result.

LayoutTests:

• platform/chromium/TestExpectations:

Enabled the layout tests, ietestcenter/css3/namespaces/prefix-007.xml
and ietestcenter/css3/namespaces/prefix-010.xml.

• platform/win/ietestcenter/css3/namespaces/prefix-007-expected.txt: Removed.
• platform/win/ietestcenter/css3/namespaces/prefix-010-expected.txt: Removed.

Removed old expectations.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/ietestcenter/css3/namespaces/prefix-007-expected.txt (deleted)
• LayoutTests/platform/win/ietestcenter/css3/namespaces/prefix-010-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleSheetContents.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-12  Takashi Sakamoto  <tasak@google.com>
+
+        webkit fails IETC namespaces/prefix-007.xml
+        https://bugs.webkit.org/show_bug.cgi?id=86137
+
+        Reviewed by Eric Seidel.
+
+        * platform/chromium/TestExpectations:
+        Enabled the layout tests, ietestcenter/css3/namespaces/prefix-007.xml
+        and ietestcenter/css3/namespaces/prefix-010.xml.
+        * platform/win/ietestcenter/css3/namespaces/prefix-007-expected.txt: Removed.
+        * platform/win/ietestcenter/css3/namespaces/prefix-010-expected.txt: Removed.
+        Removed old expectations.
+
 2012-08-11  Jon Lee  <jonlee@apple.com>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3130 +3130 @@
 BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
 // IETC namespace failures
-BUGWK86137 : ietestcenter/css3/namespaces/prefix-007.xml = IMAGE
-BUGWK86139 : ietestcenter/css3/namespaces/prefix-010.xml = IMAGE
 BUGWK86142 : ietestcenter/css3/namespaces/syntax-021.xml = IMAGE
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-12  Takashi Sakamoto  <tasak@google.com>
+
+        webkit fails IETC namespaces/prefix-007.xml
+        https://bugs.webkit.org/show_bug.cgi?id=86137
+
+        Reviewed by Eric Seidel.
+
+        If a namespace prefix or default namespace is declared more than once
+        only the last declaration shall be used.
+
+        parseAddNamespace doesn't check return value of WTF::HashMap<>::add.
+        If the return value's isNewEntry is true, the new entry is added with
+        the specified value. However, if isNewEntry is false, it is required
+        to update the store value.
+
+        No new tests. ietestcenter/css3/namespaces/prefix-007.xml and
+        ietestcenter/css3/namespaces/prefix-010.xml covers this change.
+
+        * css/StyleSheetContents.cpp:
+        (WebCore::StyleSheetContents::parserAddNamespace):
+        Modified to check m_namespaces.add's return value.
+        If the result says not a new entry, updated the value stored in
+        m_namespaces by using iterator in the result.
+
 2012-08-12  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/css/StyleSheetContents.cpp

@@ -251 +251 @@
     if (uri.isNull() || prefix.isNull())
         return;
-    m_namespaces.add(prefix, uri);
+    PrefixNamespaceURIMap::AddResult result = m_namespaces.add(prefix, uri);
+    if (result.isNewEntry)
+        return;
+    result.iterator->second = uri;
 }