Title: [213861] trunk/Source
Revision
213861
Author
[email protected]
Date
2017-03-13 12:42:05 -0700 (Mon, 13 Mar 2017)

Log Message

Fix build warnings.

Source/WebKit/mac:

* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::save):
(-[WebInspectorWindowController webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:]):

Source/WebKit2:

* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(WebKit::RemoteWebInspectorProxy::platformSave):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (213860 => 213861)


--- trunk/Source/WebKit/mac/ChangeLog	2017-03-13 19:36:27 UTC (rev 213860)
+++ trunk/Source/WebKit/mac/ChangeLog	2017-03-13 19:42:05 UTC (rev 213861)
@@ -1,3 +1,11 @@
+2017-03-13  Anders Carlsson  <[email protected]>
+
+        Fix build warnings.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorFrontendClient::save):
+        (-[WebInspectorWindowController webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:]):
+
 2017-03-11  Brady Eidson  <[email protected]>
 
         Cleanup "addCookie" and its sole user.

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (213860 => 213861)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm	2017-03-13 19:36:27 UTC (rev 213860)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm	2017-03-13 19:42:05 UTC (rev 213861)
@@ -332,9 +332,9 @@
     panel.directoryURL = [platformURL URLByDeletingLastPathComponent];
 
     auto completionHandler = ^(NSInteger result) {
-        if (result == NSFileHandlingPanelCancelButton)
+        if (result == NSModalResponseCancel)
             return;
-        ASSERT(result == NSFileHandlingPanelOKButton);
+        ASSERT(result == NSModalResponseOK);
         saveToURL(panel.URL);
     };
 
@@ -684,11 +684,11 @@
     panel.allowsMultipleSelection = allowMultipleFiles;
 
     auto completionHandler = ^(NSInteger result) {
-        if (result == NSFileHandlingPanelCancelButton) {
+        if (result == NSModalResponseCancel) {
             [resultListener cancel];
             return;
         }
-        ASSERT(result == NSFileHandlingPanelOKButton);
+        ASSERT(result == NSModalResponseOK);
 
         NSArray *URLs = panel.URLs;
         NSMutableArray *filenames = [NSMutableArray arrayWithCapacity:URLs.count];

Modified: trunk/Source/WebKit2/ChangeLog (213860 => 213861)


--- trunk/Source/WebKit2/ChangeLog	2017-03-13 19:36:27 UTC (rev 213860)
+++ trunk/Source/WebKit2/ChangeLog	2017-03-13 19:42:05 UTC (rev 213861)
@@ -1,3 +1,10 @@
+2017-03-13  Anders Carlsson  <[email protected]>
+
+        Fix build warnings.
+
+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+        (WebKit::RemoteWebInspectorProxy::platformSave):
+
 2017-03-13  Yusuke Suzuki  <[email protected]>
 
         [WTF] Clean up RunLoop and WorkQueue with Seconds and Function

Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteWebInspectorProxyMac.mm (213860 => 213861)


--- trunk/Source/WebKit2/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2017-03-13 19:36:27 UTC (rev 213860)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteWebInspectorProxyMac.mm	2017-03-13 19:42:05 UTC (rev 213861)
@@ -182,9 +182,9 @@
     panel.directoryURL = [platformURL URLByDeletingLastPathComponent];
 
     auto completionHandler = ^(NSInteger result) {
-        if (result == NSFileHandlingPanelCancelButton)
+        if (result == NSModalResponseCancel)
             return;
-        ASSERT(result == NSFileHandlingPanelOKButton);
+        ASSERT(result == NSModalResponseOK);
         saveToURL(panel.URL);
     };
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to