Changeset 250558 in webkit

Timestamp:

Oct 1, 2019, 9:37:39 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Fix internal build after r250549
​https://bugs.webkit.org/show_bug.cgi?id=202390

There is an internal #define confirm on some systems, so rename DOMWindow::confirm to DOMWindow::confirmForBindings.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::confirmForBindings):
(WebCore::DOMWindow::confirm): Deleted.

• page/DOMWindow.h:
• page/DOMWindow.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)
• page/DOMWindow.h (modified) (1 diff)
• page/DOMWindow.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-01  Alex Christensen  <achristensen@webkit.org>
+
+        Fix internal build after r250549
+        https://bugs.webkit.org/show_bug.cgi?id=202390
+
+        There is an internal #define confirm on some systems, so rename DOMWindow::confirm to DOMWindow::confirmForBindings.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::confirmForBindings):
+        (WebCore::DOMWindow::confirm): Deleted.
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+
 2019-10-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1124 +1124 @@
 }
 
-bool DOMWindow::confirm(const String& message)
+bool DOMWindow::confirmForBindings(const String& message)
 {
     auto* frame = this->frame();

trunk/Source/WebCore/page/DOMWindow.h

@@ -185 +185 @@
 
     void alert(const String& message = emptyString());
-    bool confirm(const String& message);
+    bool confirmForBindings(const String& message);
     String prompt(const String& message, const String& defaultValue);
 

trunk/Source/WebCore/page/DOMWindow.idl

@@ -87 +87 @@
     void alert();
     void alert(DOMString message);
-    boolean confirm(optional DOMString message = "");
+    [ImplementedAs=confirmForBindings]boolean confirm(optional DOMString message = "");
     DOMString? prompt(optional DOMString message = "", optional DOMString defaultValue = "");
     void print();