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

Changeset 181737 in webkit


Ignore:
Timestamp:
Mar 19, 2015, 1:49:43 AM (11 years ago)
Author:
bshafiei@apple.com
Message:

Merged r181608. rdar://problem/20184456

Location:
tags/Safari-601.1.23.3
Files:
7 edited
4 copied

Legend:

Unmodified
Added
Removed

  • tags/Safari-601.1.23.3/Source/WebCore/ChangeLog

    r181719 r181737  
     12015-03-19  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r181608.
     4
     5    2015-03-16  Jer Noble  <jer.noble@apple.com>
     6
     7            [Mac] Update missing image UI
     8            https://bugs.webkit.org/show_bug.cgi?id=142592
     9
     10            Reviewed by Darin Adler.
     11
     12            Update the broken image glyphs with new art (including a 3x image).
     13
     14            Test: fast/hidpi/broken-image-icon-very-hidpi.html
     15
     16            * Resources/missingImage.png:
     17            * Resources/missingImage@2x.png:
     18            * Resources/missingImage@3x.png: Added.
     19            * WebCore.xcodeproj/project.pbxproj:
     20            * loader/cache/CachedImage.cpp:
     21            (WebCore::CachedImage::brokenImage):
     22
    1232015-03-18  Babak Shafiei  <bshafiei@apple.com>
    224

  • tags/Safari-601.1.23.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r181468 r181737  
    1335813358                CDF2B00E1820540600F2B424 /* MockTracks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockTracks.cpp; sourceTree = "<group>"; };
    1335913359                CDF2B00F1820540600F2B424 /* MockTracks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockTracks.h; sourceTree = "<group>"; };
     13360                CDF419991AB0DA14004E64E1 /* missingImage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "missingImage@3x.png"; sourceTree = "<group>"; };
    1336013361                CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControllerInterface.h; sourceTree = "<group>"; };
    1336113362                CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMediaElementCustom.cpp; sourceTree = "<group>"; };
    … …  
    1498314984                                93153BE114195A5700FCF5BE /* missingImage.png */,
    1498414985                                93153BD914181F7A00FCF5BE /* missingImage@2x.png */,
     14986                                CDF419991AB0DA14004E64E1 /* missingImage@3x.png */,
    1498514987                                713E70AF1733E8B300A22D00 /* plugIns.js */,
    1498614988                                93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */,

  • tags/Safari-601.1.23.3/Source/WebCore/loader/cache/CachedImage.cpp

    r181412 r181737  
    171171std::pair<Image*, float> CachedImage::brokenImage(float deviceScaleFactor) const
    172172{
     173    if (deviceScaleFactor >= 3) {
     174        static NeverDestroyed<Image*> brokenImageVeryHiRes(Image::loadPlatformResource("missingImage@3x").leakRef());
     175        return std::make_pair(brokenImageVeryHiRes, 3);
     176    }
     177
    173178    if (deviceScaleFactor >= 2) {
    174179        static NeverDestroyed<Image*> brokenImageHiRes(Image::loadPlatformResource("missingImage@2x").leakRef());
Note: See TracChangeset for help on using the changeset viewer.