<https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users

Source/WebKit/mac:

Reviewed by Dan Bernstein.

* Configurations/DebugRelease.xcconfig: Use libWebKitSystemInterfaceYosemite.a on Yosemite.

Source/WebKit2:

Reviewed by Dan Bernstein.

* Configurations/DebugRelease.xcconfig: Use libWebKitSystemInterfaceYosemite.a on Yosemite.

Tools:

Reviewed by Dan Bernstein.

* Scripts/copy-webkitlibraries-to-product-directory: Copy libWebKitSystemInterfaceYosemite.a
into the build directory. Use LLVMIncludesYosemite.tar.bz2 and LLVMLibrariesYosemite.tar.bz2
for the LLVM components when on Yosemite.

WebKitLibraries:

Add versions of WebKitSystemInterface and LLVM for Yosemite. The LLVM build is from
LLVM SVN r206312, matching the Mavericks and Mountain Lion builds.

Reviewed by Dan Bernstein.

* LLVMIncludesYosemite.tar.bz2: Added.
* LLVMLibrariesYosemite.tar.bz2: Added.
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceMavericks.a:
* libWebKitSystemInterfaceMountainLion.a:
* libWebKitSystemInterfaceYosemite.a: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 8f925d11516d132118ccc1d41eb03419c5b96f43..4b109ab453172a9d798b1468b4dc13ff22ab53af 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-01  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig: Use libWebKitSystemInterfaceYosemite.a on Yosemite.
+
 2014-09-30  Chris Dumez  <cdumez@apple.com>
 
         Use is<>() / downcast<>() for Element

diff --git a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
index 592f3e9385dc3ed07cce98cd26aed61275a5adeb..fc18aa9ee1b506ec43638c7e85ca568cdb3f3780 100644 (file)
--- a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
@@ -44,7 +44,7 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimula
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 377ae36dfd5f220a8e568ad757797802c5d84250..25dcb0ddabb9e65a812cdf13a07c16c0d3e6085d 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-01  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig: Use libWebKitSystemInterfaceYosemite.a on Yosemite.
+
 2014-10-01  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r174180, r174183, and r174186.

diff --git a/Source/WebKit2/Configurations/DebugRelease.xcconfig b/Source/WebKit2/Configurations/DebugRelease.xcconfig
index 490ef6d995898a8ec4faa75fb3834e265c20626d..6c290e16dd3d7ff56b5d0ab2304875d8525ad137 100644 (file)
--- a/Source/WebKit2/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit2/Configurations/DebugRelease.xcconfig
@@ -41,7 +41,7 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimula
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 
 OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c40d9473e551baa0a4c22f61508e7724c6d503f4..aaed07ccecec3572a0fcadab4b9062e969c28d69 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2014-10-01  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/copy-webkitlibraries-to-product-directory: Copy libWebKitSystemInterfaceYosemite.a
+        into the build directory. Use LLVMIncludesYosemite.tar.bz2 and LLVMLibrariesYosemite.tar.bz2
+        for the LLVM components when on Yosemite.
+
 2014-10-01  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r174187.

diff --git a/Tools/Scripts/copy-webkitlibraries-to-product-directory b/Tools/Scripts/copy-webkitlibraries-to-product-directory
index c86019283d4cf097650f7420491b362404af5bd2..319bbf849bcb905eb46107561d9616181989bb3d 100755 (executable)
--- a/Tools/Scripts/copy-webkitlibraries-to-product-directory
+++ b/Tools/Scripts/copy-webkitlibraries-to-product-directory
@@ -140,6 +140,7 @@ if ($wksi) {
     my @librariesToCopy = (
         "libWebKitSystemInterfaceMountainLion.a",
         "libWebKitSystemInterfaceMavericks.a",
+        "libWebKitSystemInterfaceYosemite.a",
     );
     
     foreach my $libName (@librariesToCopy) {
@@ -188,6 +189,9 @@ if ($llvm) {
     } elsif ($osxVersion eq "10.9") {
         $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMavericks.tar.bz2";
         $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMavericks.tar.bz2";
+    } elsif ($osxVersion eq "10.10") {
+        $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesYosemite.tar.bz2";
+        $llvmIncludePackage = "WebKitLibraries/LLVMIncludesYosemite.tar.bz2";
     } else {
         print "Don't know where to find LLVM!\n";
         print "\n";

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index e001c28fcdd56809a0920d380249a591f27e3c26..3591e1bc60aee36bcbedd11da3e8b3524fb5effa 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,19 @@
+2014-10-01  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/137308> WebKit should build on OS X Yosemite for external users
+
+        Add versions of WebKitSystemInterface and LLVM for Yosemite. The LLVM build is from
+        LLVM SVN r206312, matching the Mavericks and Mountain Lion builds.
+
+        Reviewed by Dan Bernstein.
+
+        * LLVMIncludesYosemite.tar.bz2: Added.
+        * LLVMLibrariesYosemite.tar.bz2: Added.
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceMavericks.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+        * libWebKitSystemInterfaceYosemite.a: Added.
+
 2014-09-23  Roger Fong  <roger_fong@apple.com>
 
         [Windows] Enable CSS Supports Rule on Windows.

diff --git a/WebKitLibraries/LLVMIncludesYosemite.tar.bz2 b/WebKitLibraries/LLVMIncludesYosemite.tar.bz2
new file mode 100644 (file)
index 0000000..3540c85
Binary files /dev/null and b/WebKitLibraries/LLVMIncludesYosemite.tar.bz2 differ

diff --git a/WebKitLibraries/LLVMLibrariesYosemite.tar.bz2 b/WebKitLibraries/LLVMLibrariesYosemite.tar.bz2
new file mode 100644 (file)
index 0000000..60de3c1
Binary files /dev/null and b/WebKitLibraries/LLVMLibrariesYosemite.tar.bz2 differ

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index cf8022076fbfb6b2114468c77b53f9a924a00fd0..09fbe350bf2825406d10322136416dd669e17fca 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -42,15 +42,9 @@ typedef enum {
     WKCertificateParseResultPKCS7      = 2,
 } WKCertificateParseResult;
 
-CFStringRef WKCopyCFLocalizationPreferredName(CFStringRef localization);
-
 CFStringRef WKSignedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
 WKCertificateParseResult WKAddCertificatesToKeychainFromData(const void *bytes, unsigned length);
 
-NSString *WKGetPreferredExtensionForMIMEType(NSString *type);
-NSArray *WKGetExtensionsForMIMEType(NSString *type);
-NSString *WKGetMIMETypeForExtension(NSString *extension);
-
 NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
 NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
 
@@ -71,7 +65,6 @@ OSType WKCarbonWindowPropertyCreator(void);
 OSType WKCarbonWindowPropertyTag(void);
 #endif
 
-void WKDisableCGDeferredUpdates(void);
 #endif
 
 void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff);
@@ -83,7 +76,6 @@ unsigned WKGetNSAutoreleasePoolCount(void);
 
 void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button);
 
-NSString *WKMouseMovedNotification(void);
 NSString *WKWindowWillOrderOnScreenNotification(void);
 NSString *WKWindowWillOrderOffScreenNotification(void);
 void WKSetNSWindowShouldPostEventNotifications(NSWindow *window, BOOL post);
@@ -122,20 +114,6 @@ pid_t WKAXRemoteProcessIdentifier(id remoteElement);
 
 void WKSetUpFontCache(void);
 
-void WKSignalCFReadStreamEnd(CFReadStreamRef stream);
-void WKSignalCFReadStreamHasBytes(CFReadStreamRef stream);
-void WKSignalCFReadStreamError(CFReadStreamRef stream, CFStreamError *error);
-
-CFReadStreamRef WKCreateCustomCFReadStream(void *(*formCreate)(CFReadStreamRef, void *), 
-    void (*formFinalize)(CFReadStreamRef, void *), 
-    Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *), 
-    CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *), 
-    Boolean (*formCanRead)(CFReadStreamRef, void *), 
-    void (*formClose)(CFReadStreamRef, void *), 
-    void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), 
-    void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
-    void *context);
-
 #if !TARGET_OS_IPHONE
 void WKDrawCapsLockIndicator(CGContextRef, CGRect);
 
@@ -148,12 +126,9 @@ bool WKDrawCellFocusRingWithFrameAtTime(NSCell *cell, NSRect cellFrame, NSView *
 
 void WKSetDragImage(NSImage *image, NSPoint offset);
 
-void WKDrawBezeledTextFieldCell(NSRect, BOOL enabled);
-void WKDrawTextFieldCellFocusRing(NSTextFieldCell*, NSRect);
 void WKDrawBezeledTextArea(NSRect, BOOL enabled);
 
 void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool hideArrows);
-void WKPopupMenuWithSize(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize);
 void WKPopupContextMenu(NSMenu *menu, NSPoint screenLocation);
 void WKSendUserChangeNotifications(void);
 #ifndef __LP64__
@@ -162,7 +137,6 @@ void WKSendKeyEventToTSM(NSEvent *theEvent);
 void WKCallDrawingNotification(CGrafPtr port, Rect *bounds);
 #endif
 
-BOOL WKGetGlyphTransformedAdvances(CGFontRef, NSFont*, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance);
 NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range);
 NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch);
 void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font, BOOL shouldSubpixelQuantize);
@@ -223,18 +197,6 @@ NSEvent *WKCreateNSEventWithCarbonClickEvent(EventRef inEvent, WindowRef windowR
 CGContextRef WKNSWindowOverrideCGContext(NSWindow *, CGContextRef);
 void WKNSWindowRestoreCGContext(NSWindow *, CGContextRef);
 
-void WKNSWindowMakeBottomCornersSquare(NSWindow *);
-
-// These constants match the ones used by ThemeScrollbarArrowStyle (some of the values are private, so we can't just
-// use that enum directly).
-typedef enum {
-    WKThemeScrollBarArrowsSingle     = 0,
-    WKThemeScrollBarArrowsLowerRight = 1,
-    WKThemeScrollBarArrowsDouble     = 2,
-    WKThemeScrollBarArrowsUpperLeft  = 3,
-} WKThemeScrollBarArrowStyle;
-
-OSStatus WKThemeDrawTrack(const HIThemeTrackDrawInfo* inDrawInfo, CGContextRef inContext, int inArrowStyle);
 #endif
 
 
@@ -258,10 +220,8 @@ int WKQTMovieGetType(QTMovie* movie);
 BOOL WKQTMovieHasClosedCaptions(QTMovie* movie);
 void WKQTMovieSetShowClosedCaptions(QTMovie* movie, BOOL showClosedCaptions);
 void WKQTMovieSelectPreferredAlternates(QTMovie* movie);
-void WKQTMovieSelectPreferredAlternateTrackForMediaType(QTMovie* movie, NSString* mediaType);
 
 unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
-int WKQTMovieDataRate(QTMovie* movie);
 float WKQTMovieMaxTimeLoaded(QTMovie* movie);
 float WKQTMovieMaxTimeSeekable(QTMovie* movie);
 NSString *WKQTMovieMaxTimeLoadedChangeNotification(void);
@@ -391,11 +351,6 @@ void WKDestroyRenderingResources(void);
 
 void WKCALayerEnumerateRectsBeingDrawnWithBlock(CALayer *layer, CGContextRef context, void (^block)(CGRect rect));
 
-@class CARenderer;
-
-void WKCARendererAddChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context);
-void WKCARendererRemoveChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context);
-
 #if !TARGET_OS_IPHONE
 typedef struct __WKWindowBounceAnimationContext *WKWindowBounceAnimationContextRef;
 
@@ -414,9 +369,6 @@ NSUInteger WKGetInputPanelWindowStyle(void);
 UInt8 WKGetNSEventKeyChar(NSEvent *);
 #endif
 
-@class CAPropertyAnimation;
-void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
-
 unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
 int WKGetHTTPRequestPriority(CFURLRequestRef);
 void WKSetHTTPRequestMaximumPriority(int maximumPriority);
@@ -432,8 +384,6 @@ CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseUR
 void WKWindowSetAlpha(NSWindow *window, float alphaValue);
 void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame);
 
-void WKSyncSurfaceToView(NSView *view);
-
 void WKEnableSettingCursorWhenInBackground(void);
 #endif
 
@@ -491,8 +441,6 @@ CFStringRef WKCopyDefaultSearchProviderDisplayName(void);
 
 void WKSetCrashReportApplicationSpecificInformation(CFStringRef);
 
-NSURL* WKAVAssetResolvedURL(AVAsset*);
-
 #if !TARGET_OS_IPHONE
 NSCursor *WKCursor(const char *name);
 #endif

diff --git a/WebKitLibraries/libWebKitSystemInterfaceMavericks.a b/WebKitLibraries/libWebKitSystemInterfaceMavericks.a
index 3dd204723dece6882dbb6dca565ed20c19f4e383..b881fc41797ed29e642f1b9662fe34bdd036efb7 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceMavericks.a and b/WebKitLibraries/libWebKitSystemInterfaceMavericks.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
index 89996101c9d1a1be29e8ee25764c53d00176b476..ce42769b4cb1840b0b86aa7ea483e23660840764 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a and b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a differ

diff --git a/WebKitLibraries/libWebKitSystemInterfaceYosemite.a b/WebKitLibraries/libWebKitSystemInterfaceYosemite.a
new file mode 100644 (file)
index 0000000..185764a
Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceYosemite.a differ