Diff
Modified: trunk/Source/WebKit2/ChangeLog (174741 => 174742)
--- trunk/Source/WebKit2/ChangeLog 2014-10-15 19:35:29 UTC (rev 174741)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-15 19:39:05 UTC (rev 174742)
@@ -1,3 +1,16 @@
+2014-10-15 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] "Plug-in will handle load" error isn't declared in the modern API
+ https://bugs.webkit.org/show_bug.cgi?id=137747
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKError.mm: Define _WKLegacyErrorDomain.
+ * UIProcess/API/Cocoa/WKErrorInternal.h: Changed to import WKErrorPrivate.h.
+ * UIProcess/API/Cocoa/WKErrorPrivate.h: Added. Declares _WKLegacyErrorDomain
+ and _WKLegacyErrorPlugInWillHandleLoad.
+ * WebKit2.xcodeproj/project.pbxproj: Added new private header.
+
2014-10-15 Chris Dumez <cdu...@apple.com>
Use is<>() / downcast<>() for TransformOperation subclasses
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm (174741 => 174742)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm 2014-10-15 19:35:29 UTC (rev 174741)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm 2014-10-15 19:39:05 UTC (rev 174742)
@@ -33,6 +33,7 @@
#import <wtf/text/WTFString.h>
NSString * const WKErrorDomain = @"WKErrorDomain";
+NSString * const _WKLegacyErrorDomain = @"WebKitErrorDomain";
static NSString *localizedDescriptionForErrorCode(WKErrorCode errorCode)
{
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorInternal.h (174741 => 174742)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorInternal.h 2014-10-15 19:35:29 UTC (rev 174741)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorInternal.h 2014-10-15 19:39:05 UTC (rev 174742)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKError.h"
+#import "WKErrorPrivate.h"
#if WK_API_ENABLED
Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorPrivate.h (0 => 174742)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKErrorPrivate.h 2014-10-15 19:39:05 UTC (rev 174742)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKError.h>
+
+#if WK_API_ENABLED
+
+WK_EXTERN NSString * const _WKLegacyErrorDomain WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+typedef NS_ENUM(NSInteger, _WKLegacyErrorCode) {
+ _WKLegacyErrorPlugInWillHandleLoad = 204,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+#endif
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (174741 => 174742)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-10-15 19:35:29 UTC (rev 174741)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-10-15 19:39:05 UTC (rev 174742)
@@ -758,6 +758,7 @@
37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
37A64E5518F38E3C00EB30F1 /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
37BEC4E019491486008B4286 /* CompletionHandlerCallChecker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */; };
37BEC4E119491486008B4286 /* CompletionHandlerCallChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */; };
@@ -2767,6 +2768,7 @@
37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKActivatedElementInfo.h; sourceTree = "<group>"; };
37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormDelegate.h; sourceTree = "<group>"; };
37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormInputSession.h; sourceTree = "<group>"; };
+ 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorPrivate.h; sourceTree = "<group>"; };
37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CompletionHandlerCallChecker.mm; sourceTree = "<group>"; };
37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompletionHandlerCallChecker.h; sourceTree = "<group>"; };
37BF2F041947DEB400723C48 /* WKNSURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLRequest.h; sourceTree = "<group>"; };
@@ -5021,6 +5023,7 @@
37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */,
37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */,
1AF4592D19464B2000F9D4A2 /* WKError.h */,
+ 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */,
1AF4592C19464B2000F9D4A2 /* WKError.mm */,
1A2D252A194688FD004537B0 /* WKErrorInternal.h */,
1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
@@ -7283,6 +7286,7 @@
7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */,
1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */,
1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */,
+ 37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */,
1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */,
1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */,
1A0EC906124C0AB8007EF4A5 /* PluginProcessConnection.h in Headers */,
