Changeset 94246 in webkit

Timestamp:

Aug 31, 2011 4:16:27 PM (12 years ago)

Author:

andersca@apple.com

Message:

REGRESSION(r93902): Can't open external links on gmail
​https://bugs.webkit.org/show_bug.cgi?id=67234
<rdar://problem/10053636>

Reviewed by Alexey Proskuryakov.

• Shared/cf/ArgumentCodersCF.cpp:

(CoreIPC::decode):
If we encounter an empty URL string, create an empty url by using NSURL, just
like we do in WebCore when converting an empty KURL to an NSURL.

• WebKit2.xcodeproj/project.pbxproj:

Compile ArgumentCodersCF.cpp as Objective-C++ for now.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/cf/ArgumentCodersCF.cpp (modified) (2 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-31  Anders Carlsson  <andersca@apple.com>
+
+        REGRESSION(r93902): Can't open external links on gmail
+        https://bugs.webkit.org/show_bug.cgi?id=67234
+        <rdar://problem/10053636>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (CoreIPC::decode):
+        If we encounter an empty URL string, create an empty url by using NSURL, just
+        like we do in WebCore when converting an empty KURL to an NSURL.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+        Compile ArgumentCodersCF.cpp as Objective-C++ for now.
+
 2011-08-30  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp

@@ -31 +31 @@
 #include "DataReference.h"
 #include <wtf/Vector.h>
+
+#if PLATFORM(MAC)
+#import <Foundation/Foundation.h>
+#endif
 
 namespace CoreIPC {
@@ -514 +518 @@
         return false;
 
+#if PLATFORM(MAC)
+    // FIXME: Move this to ArgumentCodersCFMac.mm and change this file back to be C++
+    // instead of Objective-C++.
+    if (!CFStringGetLength(string.get())) {
+        // CFURL can't hold an empty URL, unlike NSURL.
+        result = reinterpret_cast<CFURLRef>([NSURL URLWithString:@""]);
+        return true;
+    }
+#endif
+                    
     CFURLRef url = CFURLCreateWithString(0, string.get(), baseURL.get());
     if (!url)

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -1110 +1110 @@
                 1AAF061312B01131008E49E2 /* PDFViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFViewController.mm; sourceTree = "<group>"; };
                 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCodersCF.h; sourceTree = "<group>"; };
-                1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCodersCF.cpp; sourceTree = "<group>"; };
+                1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = ArgumentCodersCF.cpp; sourceTree = "<group>"; };
                 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; };
                 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; };