Changeset 172197 in webkit

Timestamp:

Aug 6, 2014, 5:58:45 PM (11 years ago)

Author:

mmaxfield@apple.com

Message:

[iOS] Make document marker assets not specific to particular scale factors
​https://bugs.webkit.org/show_bug.cgi?id=135671

Reviewed by Simon Fraser.

No new tests.

• WebCore.xcodeproj/project.pbxproj:
• platform/ios/wak/WKGraphics.mm:

(imageResourcePath):
(WKGraphicsCreateImageFromBundleWithName):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Resources/SpellingDot@3x.png (added)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• platform/ios/wak/WKGraphics.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [iOS] Make document marker assets not specific to particular scale factors
+        https://bugs.webkit.org/show_bug.cgi?id=135671
+
+        Reviewed by Simon Fraser.
+
+        No new tests.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/ios/wak/WKGraphics.mm:
+        (imageResourcePath):
+        (WKGraphicsCreateImageFromBundleWithName):
+
 2014-08-06  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -934 +934 @@
                 1C21E57C183ED1FF001C289D /* IOSurfacePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C21E57A183ED1FF001C289D /* IOSurfacePool.cpp */; };
                 1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C21E57B183ED1FF001C289D /* IOSurfacePool.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C2417B91992C04100EF9938 /* SpellingDot@3x.png */; };
                 1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */; };
                 1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */; };
@@ -7912 +7913 @@
                 1C21E57A183ED1FF001C289D /* IOSurfacePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSurfacePool.cpp; path = ../cg/IOSurfacePool.cpp; sourceTree = "<group>"; };
                 1C21E57B183ED1FF001C289D /* IOSurfacePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSurfacePool.h; path = ../cg/IOSurfacePool.h; sourceTree = "<group>"; };
+                1C2417B91992C04100EF9938 /* SpellingDot@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SpellingDot@3x.png"; sourceTree = "<group>"; };
                 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoaderMac.cpp; sourceTree = "<group>"; };
                 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageMac.cpp; sourceTree = "<group>"; };
@@ -16525 +16527 @@
                         isa = PBXGroup;
                         children = (
+                                1C2417B91992C04100EF9938 /* SpellingDot@3x.png */,
                                 D02B64B014089E56006EFA21 /* DictationPhraseWithAlternativesDot.png */,
                                 D02B64B114089E56006EFA21 /* DictationPhraseWithAlternativesDot@2x.png */,
@@ -26887 +26890 @@
                         files = (
                                 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */,
+                                1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */,
                                 46D4F2490AF97E810035385A /* cellCursor.png in Resources */,
                                 93153BDE141959F400FCF5BE /* deleteButton.png in Resources */,

trunk/Source/WebCore/platform/ios/wak/WKGraphics.mm

@@ -92 +92 @@
 }
 
-static NSString *imageResourcePath(const char* imageFile, bool is2x)
+static NSString *imageResourcePath(const char* imageFile, unsigned scaleFactor)
 {
-    NSString *fileName = is2x ? [NSString stringWithFormat:@"%s@2x", imageFile] : [NSString stringWithUTF8String:imageFile];
+    NSString *fileName = scaleFactor == 1 ? [NSString stringWithUTF8String:imageFile] : [NSString stringWithFormat:@"%s@%dx", imageFile, scaleFactor];
 #if PLATFORM(IOS_SIMULATOR)
     NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"];
@@ -105 +105 @@
 }
 
-CGImageRef WKGraphicsCreateImageFromBundleWithName (const char *image_file)
+CGImageRef WKGraphicsCreateImageFromBundleWithName(const char *image_file)
 {
     if (!image_file)
@@ -111 +111 @@
 
     CGImageRef image = nullptr;
-    NSData *imageData = nil;
-
-    if (wkGetScreenScaleFactor() == 2) {
-        NSString* full2xPath = imageResourcePath(image_file, true);
-        imageData = [NSData dataWithContentsOfFile:full2xPath];
-    }
-    if (!imageData) {
-        // We got here either because we didn't request hi-dpi or the @2x file doesn't exist.
-        NSString* full1xPath = imageResourcePath(image_file, false);
-        imageData = [NSData dataWithContentsOfFile:full1xPath];
+    NSData *imageData = nullptr;
+    for (unsigned scaleFactor = wkGetScreenScaleFactor(); scaleFactor > 0; --scaleFactor) {
+        imageData = [NSData dataWithContentsOfFile:imageResourcePath(image_file, scaleFactor)];
+        ASSERT(scaleFactor != wkGetScreenScaleFactor() || imageData);
+        if (imageData)
+            break;
     }