Changeset 217865 in webkit

Timestamp:

Jun 6, 2017 4:04:48 PM (7 years ago)

Author:

aestes@apple.com

Message:

REGRESSION (r199558): WKWebView upload file which name contains Chinese character results in garbled code
​https://bugs.webkit.org/show_bug.cgi?id=172849
<rdar://problem/32567454>

Reviewed by Darin Adler.

Source/WebKit2:

This is the Mac equivalent of what was fixed in r208295. This time we use -[NSURL path] to
construct a WTF::String instead of calling String::fromUTF8() on -[NSURL fileSystemRepresentation].

• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::UIClient::runOpenPanel):

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit2Cocoa/RunOpenPanel.mm: Added.

(-[RunOpenPanelUIDelegate webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RunOpenPanel.mm (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-06  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r199558): WKWebView upload file which name contains Chinese character results in garbled code
+        https://bugs.webkit.org/show_bug.cgi?id=172849
+        <rdar://problem/32567454>
+
+        Reviewed by Darin Adler.
+
+        This is the Mac equivalent of what was fixed in r208295. This time we use -[NSURL path] to
+        construct a WTF::String instead of calling String::fromUTF8() on -[NSURL fileSystemRepresentation].
+
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::UIClient::runOpenPanel):
+
 2017-06-06  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm

@@ -396 +396 @@
         Vector<String> filenames;
         for (NSURL *url in URLs)
-            filenames.append(url.fileSystemRepresentation);
+            filenames.append(url.path);
 
         resultListener->chooseFiles(filenames);

trunk/Tools/ChangeLog

@@ +1 @@
+2017-06-06  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r199558): WKWebView upload file which name contains Chinese character results in garbled code
+        https://bugs.webkit.org/show_bug.cgi?id=172849
+        <rdar://problem/32567454>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/RunOpenPanel.mm: Added.
+        (-[RunOpenPanelUIDelegate webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
+        (TestWebKitAPI::TEST):
+
 2017-06-06  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -530 +530 @@
                 A17991881E1C994E00A505ED /* SharedBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = A17991861E1C994E00A505ED /* SharedBuffer.mm */; };
                 A179918B1E1CA24100A505ED /* SharedBufferTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17991891E1CA24100A505ED /* SharedBufferTest.cpp */; };
+                A180C0FA1EE67DF000468F47 /* RunOpenPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = A180C0F91EE67DF000468F47 /* RunOpenPanel.mm */; };
                 A1C4FB731BACD1CA003742D0 /* pages.pages in Copy Resources */ = {isa = PBXBuildFile; fileRef = A1C4FB721BACD1B7003742D0 /* pages.pages */; };
                 A1DF74321C41B65800A2F4D0 /* AlwaysRevalidatedURLSchemes.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1DF74301C41B65800A2F4D0 /* AlwaysRevalidatedURLSchemes.mm */; };
@@ -1364 +1365 @@
                 A17991891E1CA24100A505ED /* SharedBufferTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBufferTest.cpp; sourceTree = "<group>"; };
                 A179918A1E1CA24100A505ED /* SharedBufferTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedBufferTest.h; sourceTree = "<group>"; };
+                A180C0F91EE67DF000468F47 /* RunOpenPanel.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RunOpenPanel.mm; sourceTree = "<group>"; };
                 A18AA8CC1C3FA218009B2B97 /* ContentFiltering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentFiltering.h; sourceTree = "<group>"; };
                 A1A4FE5D18DD3DB700B5EA8A /* Download.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Download.mm; sourceTree = "<group>"; };
@@ -1784 +1786 @@
                                 A12DDC011E8374F500CF6CAE /* RenderedImageWithOptionsProtocol.h */,
                                 CD9E292B1C90A71F000BB800 /* RequiresUserActionForPlayback.mm */,
+                                A180C0F91EE67DF000468F47 /* RunOpenPanel.mm */,
                                 37BCA61B1B596BA9002012CA /* ShouldOpenExternalURLsInNewWindowActions.mm */,
                                 2D9A53AE1B31FA8D0074D5AA /* ShrinkToFit.mm */,
@@ -3088 +3091 @@
                                 7CCE7EDD1A411A9200447C4C /* TimeRanges.cpp in Sources */,
                                 0F4FFA9E1ED3AA8500F7111F /* SnapshotViaRenderInContext.mm in Sources */,
+                                A180C0FA1EE67DF000468F47 /* RunOpenPanel.mm in Sources */,
                                 7CCE7ED31A411A7E00447C4C /* TypingStyleCrash.mm in Sources */,
                                 7CCE7EDE1A411A9200447C4C /* URL.cpp in Sources */,