[webkit-changes] [181608] trunk

Mon, 16 Mar 2015 20:28:55 -0700

Title: [181608] trunk
Revision
181608
Author
[email protected]
Date
2015-03-16 20:28:10 -0700 (Mon, 16 Mar 2015)

Log Message

[Mac] Update missing image UI
https://bugs.webkit.org/show_bug.cgi?id=142592

Reviewed by Darin Adler.

Update the broken image glyphs with new art (including a 3x image).

Test: fast/hidpi/broken-image-icon-very-hidpi.html

* Resources/missingImage.png:
* Resources/[email protected]:
* Resources/[email protected]: Added.
* WebCore.xcodeproj/project.pbxproj:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::brokenImage):

Modified Paths

Added Paths

Diff

Added: trunk/LayoutTests/fast/hidpi/broken-image-icon-very-hidpi.html (0 => 181608)


--- trunk/LayoutTests/fast/hidpi/broken-image-icon-very-hidpi.html	                        (rev 0)
+++ trunk/LayoutTests/fast/hidpi/broken-image-icon-very-hidpi.html	2015-03-17 03:28:10 UTC (rev 181608)
@@ -0,0 +1,19 @@
+<html>
+    <script>
+        function startTest() {
+            if (window.testRunner) {
+                testRunner.waitUntilDone();
+                testRunner.setBackingScaleFactor(3, finishTest);
+            }
+        }
+        
+        function finishTest() {
+            setTimeout(function() { testRunner.notifyDone(); }, 0);
+        }
+        </script>
+    </head>
+    <body _onload_="startTest();">
+        <div>This test passes if the broken image icon appears high-resolution in HiDPI and if the outline is of the appropriate size.</div>
+        <img src=""
+    </body>
+</html>

Modified: trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-hidpi-expected.png


(Binary files differ)

Added: trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-very-hidpi-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-very-hidpi-expected.png ___________________________________________________________________

Added: svn:mime-type

Added: trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-very-hidpi-expected.txt (0 => 181608)


--- trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-very-hidpi-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-icon-very-hidpi-expected.txt	2015-03-17 03:28:10 UTC (rev 181608)
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 755x18
+          text run at (0,0) width 755: "This test passes if the broken image icon appears high-resolution in HiDPI and if the outline is of the appropriate size."
+      RenderBlock (anonymous) at (0,18) size 784x20
+        RenderImage {IMG} at (0,0) size 20x20
+        RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/hidpi/broken-image-with-size-hidpi-expected.png


(Binary files differ)

Modified: trunk/Source/WebCore/ChangeLog (181607 => 181608)


--- trunk/Source/WebCore/ChangeLog	2015-03-17 02:58:07 UTC (rev 181607)
+++ trunk/Source/WebCore/ChangeLog	2015-03-17 03:28:10 UTC (rev 181608)
@@ -1,3 +1,21 @@
+2015-03-16  Jer Noble  <[email protected]>
+
+        [Mac] Update missing image UI
+        https://bugs.webkit.org/show_bug.cgi?id=142592
+
+        Reviewed by Darin Adler.
+
+        Update the broken image glyphs with new art (including a 3x image).
+
+        Test: fast/hidpi/broken-image-icon-very-hidpi.html
+
+        * Resources/missingImage.png:
+        * Resources/[email protected]:
+        * Resources/[email protected]: Added.
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::brokenImage):
+
 2015-03-16  Dean Jackson  <[email protected]>
 
         Parsing and Style Resolution of Container-based Animation Triggers

Modified: trunk/Source/WebCore/Resources/missingImage.png (181607 => 181608)


--- trunk/Source/WebCore/Resources/missingImage.png	2015-03-17 02:58:07 UTC (rev 181607)
+++ trunk/Source/WebCore/Resources/missingImage.png	2015-03-17 03:28:10 UTC (rev 181608)
@@ -1,8 +1,28 @@
 \x89PNG
 
 -IHDR\x90\x91h6	pHYs\xD2\xDD~\xFCMIDAT(ϕRA+Da=\xDF{O,d+%~\xC0\xA4\xA4$\xF1,4K\xA5\x98\xB2\xB1\xF27L\xA3\xD8!{+v\xCA\xCE\x92\x85\xD9-i\x90\xB20\xA3isϱ\xF8ޛ7cc\xDC\xD5\xF7\x9D{\xCF=\xA7{\xAF\xDB>\xBA\xC1""\xB1\x96\xCDtY\xBDuX\x8A(\xCF_\xFCY}\xBD>I)2
-\x80(\x8F\xB2i\xA0\xF8\xE7\x820\x80s\xFEgTd$\x91\xBEZƕ\xD9\x99\xA1\xFE\x87\xDA\xC7\xC1\xE5\xF3c\xF53\xEC\xEDI̼EJ\\x9E^\x98\xDC)\xDE\xE7O\xCA\xCB\xD3\xC3{\x8Bcq\x8A`ֲd\xD3y\xF9\x92L\xB5\xC6\x80\x81\xBEHd\x9C\xF5\x96\x9A\xC6AR\xE9\xA9^z\xAA\xCA͎\x9E\xDFU\xF3\xC7e\x99Z\x84\xA61V`yZf\xA8\xFF\xED\xFD{i\xF7
-\x80\xB6+tXJUyiT^2QJ\xD0oK4K	f\xFB\xB9)\xD9\xC2\\xC7*RK\xED
-2\xFA\x8E2\xCAu0\x8C\x8A\x92\xB1*%H\xF3\xC5\xF8݆\xB7ƚ..Ynڵ\xF7\x8B\x8B-\xDD\xE6\xBA9>\xA3\xDC\xEA\xE6i\x97\xA7\xEA\xE3\xCEh_\x80ޭIEND\xAEB`\x82
\ No newline at end of file
+IHDR\x90\x91h6gAMA\xB1\x8F\xFCa cHRMz&\x80\x84\xFA\x80\xE8u0\xEA`:\x98p\x9C\xBAQ<	pHYs\xD2\xDD~\xFC\xD3iTXtXML:com.adobe.xmp<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+            xmlns:exif="http://ns.adobe.com/exif/1.0/">
+         <xmp:ModifyDate>2015-02-27T12:20:07</xmp:ModifyDate>
+         <xmp:CreatorTool>Adobe Photoshop CC 2014 (Macintosh)</xmp:CreatorTool>
+         <xmp:CreateDate>2008-04-21T03:28:15</xmp:CreateDate>
+         <tiff:Orientation>1</tiff:Orientation>
+         <tiff:YResolution>4391/61</tiff:YResolution>
+         <tiff:ResolutionUnit>2</tiff:ResolutionUnit>
+         <tiff:XResolution>4391/61</tiff:XResolution>
+         <exif:ColorSpace>1</exif:ColorSpace>
+         <exif:PixelXDimension>16</exif:PixelXDimension>
+         <exif:PixelYDimension>16</exif:PixelYDimension>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+m9\xAAIDAT(\x95RMKBA}3o\xFC\xADE\xE1"\x95P\xD4"\x83vA\xD4?\xB7-*\xEC'\xB4\xF0$\xB4n\xB4\xB0U\xB5mW`\x9B\xDA)IE-RZ%\x94\xA6\xBE\x99\xE9̌O\xEA\xF2xܹ\xE7\x9C\xFB5C\xF2\xF7\xD6\x8C	)W\xC7\xFF(\xC9\xE5\xEF\x99\x8A<\xBBm4\xD07\xD9hiI?\xA3FmJ\x88Ɗk\xD3 \xAB
+8J\xFD\xEB\xAD\xE9\xCC\xA4&\xA2?;\xBE\xAD\xE5\x9F>\xBC\x8Cz\xA8\x91X Sp\x85l;"6\xE09ZI\xCA\xF5\xB3\xBB\xDA\xF6R|}r\xE8\xF3\xCB1(h \xA3%#P\x9D	!\xC6#\xC1͓\x87Û\xD7\x{1C64CC}\x85\x92\xC3\xC1f\x81K/\xAA	\x929F\xC0\x95̖\xD6e\xB9\x8EAJ\xC6"\x81\xE5D4{^\xF1"5
+Ȕ\xEBrÈ\x94>\xAA晊\xFAO7f\xB2g\x8F{\xA5g\xBF\xAD*\xC3 \x99q\xEDI\xAE\x97\x85\x98e\xB5ZN:9z\\xAC\xEE^UGB^	\xDC
+ C\xA0\x9A=\xD4ٹ\xA8Կx\xC4G)v\xE1\xB2ASCw[Rɵq.\xC2\x8A\xEF\xE6\xA5-\xEC\xCEB]H\xD2\xEEШk>\xA7-\xB6\xE2\xE9\xB9\xE6MW\xFCX\xABI`Vꠄ\xEB+\xFB\x984\xC1j\xEFj\xE8\xCEŹA\xCBC\xC8 D\xDApe\xDD8}q\xFAQ<dz\x81~>\xDE\xC9\xE4
+\xFD\xE0_\xE3\xDF9T{ܵ\xE9IEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Source/WebCore/Resources/[email protected]


(Binary files differ)

Added: trunk/Source/WebCore/Resources/[email protected]


(Binary files differ)
Property changes on: trunk/Source/WebCore/Resources/[email protected] ___________________________________________________________________

Added: svn:mime-type

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (181607 => 181608)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2015-03-17 02:58:07 UTC (rev 181607)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2015-03-17 03:28:10 UTC (rev 181608)
@@ -13366,6 +13366,7 @@
 		CDF2B00D1820540600F2B424 /* MockSourceBufferPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockSourceBufferPrivate.h; sourceTree = "<group>"; };
 		CDF2B00E1820540600F2B424 /* MockTracks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockTracks.cpp; sourceTree = "<group>"; };
 		CDF2B00F1820540600F2B424 /* MockTracks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockTracks.h; sourceTree = "<group>"; };
+		CDF419991AB0DA14004E64E1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		CDF65CC9145B43A700C4C7AA /* MediaControllerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControllerInterface.h; sourceTree = "<group>"; };
 		CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMediaElementCustom.cpp; sourceTree = "<group>"; };
 		CDF7483C18FEBCEC0006ECC0 /* GridResolvedPosition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GridResolvedPosition.cpp; path = style/GridResolvedPosition.cpp; sourceTree = "<group>"; };
@@ -14991,6 +14992,7 @@
 				7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
 				93153BE114195A5700FCF5BE /* missingImage.png */,
 				93153BD914181F7A00FCF5BE /* [email protected] */,
+				CDF419991AB0DA14004E64E1 /* [email protected] */,
 				713E70AF1733E8B300A22D00 /* plugIns.js */,
 				93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */,
 				9370918C1416D86B00477333 /* [email protected] */,

Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (181607 => 181608)


--- trunk/Source/WebCore/loader/cache/CachedImage.cpp	2015-03-17 02:58:07 UTC (rev 181607)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp	2015-03-17 03:28:10 UTC (rev 181608)
@@ -170,6 +170,11 @@
 
 std::pair<Image*, float> CachedImage::brokenImage(float deviceScaleFactor) const
 {
+    if (deviceScaleFactor >= 3) {
+        static NeverDestroyed<Image*> brokenImageVeryHiRes(Image::loadPlatformResource("missingImage@3x").leakRef());
+        return std::make_pair(brokenImageVeryHiRes, 3);
+    }
+
     if (deviceScaleFactor >= 2) {
         static NeverDestroyed<Image*> brokenImageHiRes(Image::loadPlatformResource("missingImage@2x").leakRef());
         return std::make_pair(brokenImageHiRes, 2);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to