Diff
Modified: trunk/Source/WebKit2/ChangeLog (161565 => 161566)
--- trunk/Source/WebKit2/ChangeLog 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-09 19:38:41 UTC (rev 161566)
@@ -1,3 +1,14 @@
+2014-01-09 Dan Bernstein <[email protected]>
+
+ [Cocoa] Promote WKBackForwardList{,Item}.h to public
+ https://bugs.webkit.org/show_bug.cgi?id=126707
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKBackForwardList.h: Stopped including the C API header.
+ * UIProcess/API/Cocoa/WKBackForwardListItem.h: Ditto.
+ * WebKit2.xcodeproj/project.pbxproj: Made the headers public.
+
2014-01-09 Zan Dobersek <[email protected]>
Revert back to using the -n option when producing symbolic links to the GTK-specific
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (161565 => 161566)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-01-09 19:38:41 UTC (rev 161566)
@@ -23,15 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <WebKit2/WKBackForwardListRef.h>
-
-#ifdef __OBJC__
-
-#import <WebKit2/WKBackForwardListItem.h>
#import <WebKit2/WKFoundation.h>
#if WK_API_ENABLED
+#import <WebKit2/WKBackForwardListItem.h>
+
WK_API_CLASS
@interface WKBackForwardList : NSObject
@@ -50,5 +47,3 @@
@end
#endif // WK_API_ENABLED
-
-#endif // defined(__OBJC__)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h (161565 => 161566)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2014-01-09 19:38:41 UTC (rev 161566)
@@ -23,10 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <WebKit2/WKBackForwardListItemRef.h>
-
-#ifdef __OBJC__
-
#import <WebKit2/WKFoundation.h>
#if WK_API_ENABLED
@@ -43,5 +39,3 @@
@end
#endif // WK_API_ENABLED
-
-#endif // defined(__OBJC__)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (161565 => 161566)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-01-09 19:38:41 UTC (rev 161566)
@@ -515,10 +515,10 @@
37948408150C4B9700E52CE9 /* WKRenderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37948406150C4B9600E52CE9 /* WKRenderLayer.cpp */; };
37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 37948407150C4B9600E52CE9 /* WKRenderLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
37C4C08618149C5B003688B9 /* WKBackForwardListItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */; };
- 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
37C4C08918149F23003688B9 /* WKBackForwardListItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */; };
37C4C08C1814AC5C003688B9 /* WKBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */; };
- 37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
37C4C0931814B3AF003688B9 /* WKNSArray.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C0911814B3AF003688B9 /* WKNSArray.mm */; };
37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C0921814B3AF003688B9 /* WKNSArray.h */; };
37C4C0951814B9E6003688B9 /* WKBackForwardListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08E1814AF3A003688B9 /* WKBackForwardListInternal.h */; };
Modified: trunk/Tools/ChangeLog (161565 => 161566)
--- trunk/Tools/ChangeLog 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Tools/ChangeLog 2014-01-09 19:38:41 UTC (rev 161566)
@@ -1,3 +1,13 @@
+2014-01-09 Dan Bernstein <[email protected]>
+
+ [Cocoa] Promote WKBackForwardList{,Item}.h to public
+ https://bugs.webkit.org/show_bug.cgi?id=126707
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/check-for-webkit-framework-include-consistency: Account for stale private headers
+ left behind in the build products directory after a private header is made public.
+
2014-01-09 Carlos Garcia Campos <[email protected]>
[SOUP] Partial file left on disk after a download fails or is cancelled in WebKit2
Modified: trunk/Tools/Scripts/check-for-webkit-framework-include-consistency (161565 => 161566)
--- trunk/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-01-09 19:25:23 UTC (rev 161565)
+++ trunk/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-01-09 19:38:41 UTC (rev 161566)
@@ -48,7 +48,10 @@
$HEADER_NAMES_TO_TYPE[$1] = :public
$HEADERS_BY_TYPE[:public] << header
elsif /\/PrivateHeaders\/(.*)/.match(header)
- $HEADER_NAMES_TO_TYPE[$1] = :private
+ # If the same header exists both as a public header and as a private header, assume that it
+ # has been promoted to public, and the private instance is stale.
+ # FIXME: This can be improved by checking time stamps.
+ $HEADER_NAMES_TO_TYPE[$1] = :private if !$HEADER_NAMES_TO_TYPE[$1]
$HEADERS_BY_TYPE[:private] << header
else
print_error "Unknown header type: #{header}"
@@ -65,13 +68,6 @@
# Ignore includes that aren't related to other WebKit headers.
return unless framework =~ /^Web/
- # Ignore iOS headers that were mistakenly made Private on Mac builds in
- # http://trac.webkit.org/r158443. Even though this issue was resolved in
- # http://trac.webkit.org/r158454, stale copies might still exist in the build
- # directory.
- # FIXME: Remove this after some reasonable amount of time.
- return if ['MemoryMeasure.h', 'WebGeolocationCoreLocationProvider.h', 'WebGeolocationProviderIOS.h', 'WebNSStringDrawing.h', 'WebNSStringExtrasIOS.h', 'WebNSStringExtrasIPhone.h', 'WebUIKitSupport.h', 'WebCaretChangeListener.h', 'WebFixedPositionContent.h', 'WebFrameIOS.h', 'WebFrameIPhone.h', 'WebGeolocationPrivate.h', 'WebMIMETypeRegistry.h', 'WebSelectionRect.h', 'WebVisiblePosition.h', 'WebUIKitDelegate.h', 'WebPDFViewIOS.h', 'WebPDFViewIPhone.h', 'WebPDFViewPlaceholder.h'].include?(File.basename(header))
-
# A header of any type including a WebCore header is a recipe for disaster.
if framework == "WebCore"
print_error "#{header} included #{included_header}!"
