ChangeLog

2014-08-03  Dan Bernstein  <mitz@apple.com>

        <rdar://problem/17897271> REGRESSION: OS marketing version in iOS Simulator user-agent string is the host OS’s

        https://bugs.webkit.org/show_bug.cgi?id=135549

        Reviewed by NOBODY (OOPS!).

        * platform/cocoa/SystemVersion.mm:

        (WebCore::createSystemMarketingVersion): On the iOS Simulator, locate the system Library

        directory relative to the Simulator root.

2014-08-02  Jeremy Jones  <jeremyj@apple.com>

        Support both window and view based video fullscreen.

171983

Source/WebCore/platform/cocoa/SystemVersion.mm

@@static NSString *createSystemMarketingVe

{

    // Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.

    NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, YES) objectAtIndex:0];

#if PLATFORM(IOS_SIMULATOR)

    if (char *simulatorRoot = getenv("SIMULATOR_ROOT"))

        systemLibraryPath = [NSString stringWithFormat:@"%s/%@", simulatorRoot, systemLibraryPath];

#endif

    NSString *systemVersionPlistPath = [systemLibraryPath stringByAppendingPathComponent:@"CoreServices/SystemVersion.plist"];

    NSDictionary *systemVersionInfo = [NSDictionary dictionaryWithContentsOfFile:systemVersionPlistPath];

    return [[systemVersionInfo objectForKey:@"ProductVersion"] copy];

171960