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

Changeset 185831 in webkit


Ignore:
Timestamp:
Jun 22, 2015, 9:35:33 AM (11 years ago)
Author:
bshafiei@apple.com
Message:

Merged r185814. rdar://problem/21444762

Location:
tags/Safari-601.1.35.2.3/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-601.1.35.2.3/Source/WebKit2/ChangeLog

    r185619 r185831  
     12015-06-22  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r185814.
     4
     5    2015-06-21  Dan Bernstein  <mitz@apple.com>
     6
     7            <rdar://problem/21444762> REGRESSION (r184215): Plug-in services crash on launch on Yosemite
     8            https://bugs.webkit.org/show_bug.cgi?id=146195
     9
     10            Reviewed by Sam Weinig.
     11
     12            * Configurations/PluginService.32.xcconfig: Changed the Yosemite definition of
     13            INFOPLIST_FILE such that it would also apply to the macosx10.10.internal SDK.
     14            * Configurations/PluginService.64.xcconfig: Ditto.
     15
    1162015-06-16  Babak Shafiei  <bshafiei@apple.com>
    217

  • tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r184215 r185831  
    3333INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    3434INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    35 INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     35INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    3636
    3737OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);

  • tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r184215 r185831  
    3333INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    3434INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    35 INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     35INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    3636
    3737OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
Note: See TracChangeset for help on using the changeset viewer.