⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 101215 in webkit


Ignore:
Timestamp:
Nov 27, 2011, 3:47:22 PM (15 years ago)
Author:
mrowe@apple.com
Message:

<​http://webkit.org/b/72665> Switch to a more modern approach to retrieving the OS marketing version

Reviewed by Dan Bernstein.

Source/WebCore:

  • WebCore.exp.in: Expose the necessary symbol.
  • platform/mac/WebCoreSystemInterface.h: Ditto.
  • platform/mac/WebCoreSystemInterface.mm: Ditto.

Source/WebKit/mac:

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Set up wkGetMacOSXVersionString.

  • WebView/WebView.mm:

(createMacOSXVersionString): Use WKGetMacOSXVersionString.

Source/WebKit2:

  • UIProcess/mac/WebPageProxyMac.mm:

(WebKit::macOSXVersionString): Use WKGetMacOSXVersionString.

  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Set up wkGetMacOSXVersionString.

Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r101213 r101215  
     12011-11-27  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72665> Switch to a more modern approach to retrieving the OS marketing version
     4
     5        Reviewed by Dan Bernstein.
     6
     7        * WebCore.exp.in: Expose the necessary symbol.
     8        * platform/mac/WebCoreSystemInterface.h: Ditto.
     9        * platform/mac/WebCoreSystemInterface.mm: Ditto.
     10
    1112011-11-27  Anna Cavender  <annacc@chromium.org>
    212

  • trunk/Source/WebCore/WebCore.exp.in

    r100985 r101215  
    15571557#endif
    15581558
     1559#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     1560_wkGetMacOSXVersionString
     1561#endif
     1562
    15591563_wkUnregisterUniqueIdForElement
    15601564_wkAccessibilityHandleFocusChanged

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r98280 r101215  
    311311extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
    312312#endif
    313    
     313
    314314#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    315315#import <dispatch/dispatch.h>
    316    
     316
    317317extern dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
    318    
    319 #endif
     318
     319#endif
     320
     321#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     322extern NSString *(*wkGetMacOSXVersionString)(void);
     323#endif
     324
    320325}
    321326

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

    r98280 r101215  
    177177#endif
    178178
     179#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     180NSString *(*wkGetMacOSXVersionString)(void);
     181#endif

  • trunk/Source/WebKit/mac/ChangeLog

    r101201 r101215  
     12011-11-27  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72665> Switch to a more modern approach to retrieving the OS marketing version
     4
     5        Reviewed by Dan Bernstein.
     6
     7        * WebCoreSupport/WebSystemInterface.mm:
     8        (InitWebCoreSystemInterface): Set up wkGetMacOSXVersionString.
     9        * WebView/WebView.mm:
     10        (createMacOSXVersionString): Use WKGetMacOSXVersionString.
     11
    1122011-11-26  Pavel Feldman  <pfeldman@google.com>
    213

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

    r98280 r101215  
    167167#endif
    168168
     169#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     170    INIT(GetMacOSXVersionString);
     171#endif
     172
    169173    didInit = true;
    170174}

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r100534 r101215  
    507507@implementation WebView (WebPrivate)
    508508
     509#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     510
     511static NSString *createMacOSXVersionString()
     512{
     513    // Use underscores instead of dots because when we first added the Mac OS X version to the user agent string
     514    // we were concerned about old DHTML libraries interpreting "4." as Netscape 4. That's no longer a concern for us
     515    // but we're sticking with the underscores for compatibility with the format used by older versions of Safari.
     516    return [WKGetMacOSXVersionString() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
     517}
     518
     519#else
     520
    509521static inline int callGestalt(OSType selector)
    510522{
    … …  
    529541    return [[NSString alloc] initWithFormat:@"%d", major];
    530542}
     543
     544#endif // !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
    531545
    532546static NSString *createUserVisibleWebKitVersionString()

  • trunk/Source/WebKit2/ChangeLog

    r101201 r101215  
     12011-11-27  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/72665> Switch to a more modern approach to retrieving the OS marketing version
     4
     5        Reviewed by Dan Bernstein.
     6
     7        * UIProcess/mac/WebPageProxyMac.mm:
     8        (WebKit::macOSXVersionString): Use WKGetMacOSXVersionString.
     9        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     10        (InitWebCoreSystemInterface): Set up wkGetMacOSXVersionString.
     11
    1122011-11-26  Pavel Feldman  <pfeldman@google.com>
    213

  • trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

    r95901 r101215  
    3838#import "WebPageMessages.h"
    3939#import "WebProcessProxy.h"
     40#import <WebKitSystemInterface.h>
    4041#import <wtf/text/StringConcatenate.h>
    4142
    … …  
    5859#endif
    5960
     61#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     62
     63static String macOSXVersionString()
     64{
     65    // Use underscores instead of dots because when we first added the Mac OS X version to the user agent string
     66    // we were concerned about old DHTML libraries interpreting "4." as Netscape 4. That's no longer a concern for us
     67    // but we're sticking with the underscores for compatibility with the format used by older versions of Safari.
     68    return [WKGetMacOSXVersionString() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
     69}
     70
     71#else
     72
    6073static inline int callGestalt(OSType selector)
    6174{
    … …  
    8093    return String::format("%d", major);
    8194}
     95
     96#endif // !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
    8297
    8398static String userVisibleWebKitVersionString()

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r98280 r101215  
    142142        INIT(AccessibilityHandleFocusChanged);
    143143        INIT(CreateAXUIElementRef);
    144         INIT(UnregisterUniqueIdForElement);       
     144        INIT(UnregisterUniqueIdForElement);
    145145
    146146        INIT(GetCFURLResponseMIMEType);
    … …  
    154154#endif
    155155
     156#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
     157        INIT(GetMacOSXVersionString);
     158#endif
     159
    156160    });
    157161}
Note: See TracChangeset for help on using the changeset viewer.