Changeset 171984 in webkit

Timestamp:

Aug 3, 2014, 12:21:49 PM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/17782529> 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 Mark Rowe.

• platform/cocoa/SystemVersion.mm:

(WebCore::createSystemMarketingVersion): On the iOS Simulator, locate the system Library
directory relative to the Simulator root.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cocoa/SystemVersion.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-03  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/17782529> 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 Mark Rowe.
+
+        * 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>
 

trunk/Source/WebCore/platform/cocoa/SystemVersion.mm

@@ -34 +34 @@
     // 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];