Changeset 259543 in webkit

Timestamp:

Apr 4, 2020, 9:16:19 PM (6 years ago)

Author:

ddkilzer@apple.com

Message:

Build fix v2: HTMLFormElement should use WeakPtr to keep track of its FormNamedItem
​https://bugs.webkit.org/show_bug.cgi?id=209925

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::elementFromPastNamesMap const):
(WebCore::HTMLFormElement::addToPastNamesMap):

• Apply macros consistently. Regressed in r259513 and was not fixed by r259527.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-04  David Kilzer  <ddkilzer@apple.com>
+
+        Build fix v2: HTMLFormElement should use WeakPtr to keep track of its FormNamedItem
+        https://bugs.webkit.org/show_bug.cgi?id=209925
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::elementFromPastNamesMap const):
+        (WebCore::HTMLFormElement::addToPastNamesMap):
+        - Apply macros consistently.  Regressed in r259513 and was
+          not fixed by r259527.
+
 2020-04-04  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/html/HTMLFormElement.cpp

@@ -765 +765 @@
 }
 
-#if ASSERT_ENABLED || ENABLE(SECURITY_ASSERTIONS)
+#if ASSERT_ENABLED
 void HTMLFormElement::assertItemCanBeInPastNamesMap(FormNamedItem* item) const
 {
@@ -790 +790 @@
         return nullptr;
     auto element = makeRefPtr(weakElement.get());
-#if ASSERT_ENABLED || ENABLE(SECURITY_ASSERTIONS)
+#if ASSERT_ENABLED
     assertItemCanBeInPastNamesMap(element->asFormNamedItem());
 #endif
@@ -798 +798 @@
 void HTMLFormElement::addToPastNamesMap(FormNamedItem* item, const AtomString& pastName)
 {
-#if ASSERT_ENABLED || ENABLE(SECURITY_ASSERTIONS)
+#if ASSERT_ENABLED
     assertItemCanBeInPastNamesMap(item);
 #endif