Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193887 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-10 03:16:45 UTC (rev 193887)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-10 03:16:48 UTC (rev 193888)
@@ -1,3 +1,23 @@
+2015-12-09 Simon Fraser <simon.fra...@apple.com>
+
+ Merge r191590. rdar://problem/23432368
+
+ 2015-10-26 Simon Fraser <simon.fra...@apple.com>
+
+ Implement 'round' and 'space' values for border-image
+ https://bugs.webkit.org/show_bug.cgi?id=14185
+
+ Reviewed by Tim Horton.
+
+ Ref tests that clip, leaving relevant parts of the images.
+
+ * fast/borders/border-image-round-expected.html: Added.
+ * fast/borders/border-image-round.html: Added.
+ * fast/borders/border-image-space-expected.html: Added.
+ * fast/borders/border-image-space.html: Added.
+ * fast/borders/resources/big-border-image-lines.png: Added.
+ * fast/borders/resources/big-border-image.png: Added.
+
2015-12-09 Matthew Hanson <matthew_han...@apple.com>
Merge r192639. rdar://problem/23814338
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round-expected.html (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round-expected.html 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,43 @@
+<html>
+<head>
+ <style>
+ div {
+ border-width: 50px 0 0 0;
+ margin: 10px;
+ width: 50px;
+ height: 50px;
+ box-sizing: border-box;
+ background-color: gray;
+ border-image: url('resources/big-border-image-lines.png') 30 70 60 40;
+ border-image-repeat: stretch;
+ }
+
+ .one {
+ width: 159px;
+ }
+
+ .two {
+ width: 239px;
+ }
+
+ .three {
+ width: 319px;
+ }
+
+ .vertical {
+ border-width: 0 50px 0 0;
+ width: 50px;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body>
+ <div class="horizontal" style="width: 159px; -webkit-clip-path: inset(2px 120px 2px 6px);"></div>
+ <div class="horizontal" style="width: 239px; -webkit-clip-path: inset(2px 122px 2px 6px);"></div>
+ <div class="horizontal" style="width: 319px; -webkit-clip-path: inset(2px 220px 2px 6px);"></div>
+
+ <div class="vertical" style="height: 159px; -webkit-clip-path: inset(4px 2px 4px 2px);"></div>
+ <div class="vertical" style="height: 239px; -webkit-clip-path: inset(122px 2px 4px 2px);"></div>
+ <div class="vertical" style="height: 319px; -webkit-clip-path: inset(220px 2px 6px 2px);"></div>
+</body>
+</html>
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round.html (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-round.html 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,44 @@
+<html>
+<head>
+ <style>
+ div {
+ border-width: 50px 0 0 0;
+ margin: 10px;
+ width: 50px;
+ height: 50px;
+ box-sizing: border-box;
+ background-color: gray;
+ border-image: url('resources/big-border-image-lines.png') 30 70 60 40;
+ border-image-repeat: round;
+ }
+
+ .one {
+ width: 159px;
+ }
+
+ .two {
+ width: 239px;
+ }
+
+ .three {
+ width: 319px;
+ }
+
+ .vertical {
+ border-width: 0 50px 0 0;
+ width: 50px;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body>
+ <!-- Clip to remove the black borders of the source image -->
+ <div class="horizontal" style="width: 159px; -webkit-clip-path: inset(2px 120px 2px 6px);"></div>
+ <div class="horizontal" style="width: 239px; -webkit-clip-path: inset(2px 122px 2px 6px);"></div>
+ <div class="horizontal" style="width: 319px; -webkit-clip-path: inset(2px 220px 2px 6px);"></div>
+
+ <div class="vertical" style="height: 159px; -webkit-clip-path: inset(4px 2px 4px 2px);"></div>
+ <div class="vertical" style="height: 239px; -webkit-clip-path: inset(122px 2px 4px 2px);"></div>
+ <div class="vertical" style="height: 319px; -webkit-clip-path: inset(220px 2px 6px 2px);"></div>
+</body>
+</html>
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space-expected.html (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space-expected.html 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,41 @@
+<html>
+<head>
+ <style>
+ div {
+ border-width: 50px 0 0 0;
+ margin: 10px;
+ width: 50px;
+ height: 50px;
+ box-sizing: border-box;
+ background-color: gray;
+ }
+
+ .one {
+ width: 159px;
+ }
+
+ .two {
+ width: 239px;
+ }
+
+ .three {
+ width: 319px;
+ }
+
+ .vertical {
+ border-width: 0 50px 0 0;
+ width: 50px;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body>
+ <div class="horizontal" style="width: 159px; -webkit-clip-path: inset(0 120px 0 0)"></div>
+ <div class="horizontal" style="width: 239px; -webkit-clip-path: inset(0 110px 0 110px)"></div>
+ <div class="horizontal" style="width: 319px; -webkit-clip-path: inset(0 200px 0 100px)"></div>
+
+ <div class="vertical" style="height: 159px; -webkit-clip-path: inset(0 0 130px 0)"></div>
+ <div class="vertical" style="height: 239px; -webkit-clip-path: inset(112px 0 112px 0)"></div>
+ <div class="vertical" style="height: 319px; -webkit-clip-path: inset(102px 0 206px 0)"></div>
+</body>
+</html>
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space.html (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/border-image-space.html 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,44 @@
+<html>
+<head>
+ <style>
+ div {
+ border-width: 50px 0 0 0;
+ margin: 10px;
+ width: 50px;
+ height: 50px;
+ box-sizing: border-box;
+ background-color: gray;
+ border-image: url('resources/big-border-image.png') 30 70 60 40;
+ border-image-repeat: space;
+ }
+
+ .one {
+ width: 159px;
+ }
+
+ .two {
+ width: 239px;
+ }
+
+ .three {
+ width: 319px;
+ }
+
+ .vertical {
+ border-width: 0 50px 0 0;
+ width: 50px;
+ display: inline-block;
+ }
+ </style>
+</head>
+<body>
+ <!-- Clip to reveal the gaps between the spaced imges -->
+ <div class="horizontal" style="width: 159px; -webkit-clip-path: inset(0 120px 0 0)"></div>
+ <div class="horizontal" style="width: 239px; -webkit-clip-path: inset(0 110px 0 110px)"></div>
+ <div class="horizontal" style="width: 319px; -webkit-clip-path: inset(0 200px 0 100px)"></div>
+
+ <div class="vertical" style="height: 159px; -webkit-clip-path: inset(0 0 130px 0)"></div>
+ <div class="vertical" style="height: 239px; -webkit-clip-path: inset(112px 0 112px 0)"></div>
+ <div class="vertical" style="height: 319px; -webkit-clip-path: inset(102px 0 206px 0)"></div>
+</body>
+</html>
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image-lines.png (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image-lines.png (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image-lines.png 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,16 @@
+\x89PNG
+
++IHDR\xBE\xB4*\xEF\x96\xFBgAMA\xB1\x8F \xFCa cHRMz&\x80\x84\xFA\x80\xE8u0\xEA`:\x98p\x9C\xBAQ< pHYs \x9A\x9C\xD5iTXtXML: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:tiff="http://ns.adobe.com/tiff/1.0/">
+ <tiff:Compression>5</tiff:Compression>
+ <tiff:Orientation>1</tiff:Orientation>
+ <tiff:PhotometricInterpretation>2</tiff:PhotometricInterpretation>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+\x8BO\xB2hIDATx\xED\xDC1\xAA T\x85\xE1\xEF+ \x803\xB0\x9C\x88(\x8EDk kA \x89(ND\xB0u\xC0"IB`\xA7I\xB3ݞ\xF5\xA5\xC9\xE6䅽~.\xAF\xBA/ \x8Fǫ'(#\xF0\xFC:\xEFˏw\xA6~\xFE\xEB\xDD]/\xDF+\xFE~/o\xEA}\xFA\xEC\x87\xF7\xFAO\xD7\xFF\xF0\xEF\xDF>=}p}J8 \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%< \xFE\x8A\xA7\xFB \xFF\xFE\x8E%<x\xE1KcT<]O\xC0'\xFE\xF5 x"\xF0\xE6\xEBt\xFE\xE8\xF3ӿ\xFD\xE7o_\xFD\xFDۛ^\xFE\xF3\x9F\x9F\xF2\xBF<\xE0\xF9÷g\xFF\xF1\x9Do\x9B\xCE?\xFD\xFEٷ%'s\xBF\xEA\xF4t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i
~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6 ~Oג\xE2 c\xE2\xF7t-i ~\xC00\xF6x\xF1x<^\xF5ĕ\x81\xB7|\xE23\xA1\x92\xC0\xF3\xEB\xD4?\xB13\xFBW\xBF\xBE\xBD\xEB\xE5'?\xEE<p\xF9U\xCF~\xF3\xF6\xC2/Z~\xE9\xF0y\xBF|\xFD\xE4\x98\xB9u;G\xAE&@\
xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;G\xAE&@\xFCa\xE0\xD6\xED @\xFC =\xB8b\x98\xF1\x87\x81[\xB7\x83\xF1w\xF4\xE0\x8Aa\xC4 n\xDD\xC4\xDFу+\x86 \xB8u;\xBCx< \xAFv\x9C\xE2
+\xE6\xFC \xACO\x8B>\xEA\xFD\xF2IEND\xAEB`\x82
\ No newline at end of file
Added: branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image.png (0 => 193888)
--- branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image.png (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/borders/resources/big-border-image.png 2015-12-10 03:16:48 UTC (rev 193888)
@@ -0,0 +1,16 @@
+\x89PNG
+
++IHDR\xBE\xB4*\xEF\x96\xFBsRGB\xAE\xCE \xE9 pHYs \x9A\x9C>iTXtXML: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:tiff="http://ns.adobe.com/tiff/1.0/"
+ xmlns:exif="http://ns.adobe.com/exif/1.0/">
+ <tiff:PhotometricInterpretation>2</tiff:PhotometricInterpretation>
+ <tiff:Compression>5</tiff:Compression>
+ <tiff:Orientation>1</tiff:Orientation>
+ <exif:ColorSpace>65535</exif:ColorSpace>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+\xBF^\x88IDATx\xEDܱ\xADfD\xE1\xB7\x87.\x9A!\xC21 Јc JC"q\x8E \xE9\x87gu\xF5m8\xCC\xCF m\xB8\x8F\xD7\xF7/\xAF/O\xFC\xF9\xE3ϧ~\xDE\x93\xFB\xF5\xB4\x9F O\xFF\xC6\xE2\x81o\x8AR\x9D\xD4\x88_/\xA0?!@\xFC\xBBҚ\xF1\xEB\xF4'\x88\x9F`WZ ~\xBD\x80\xFE\x84\xF1\xECJkįП ~\x82]iM\x80\xF8\xF5\xFA\xC4O\xB0+\xAD \xBF^@B\x80\xF8 v\xA55\xE2\xD7 \xE8O?\xC1\xAE\xB4&@\xFCz\xFD \xE2'ؕ\xD6\x88_/\xA0?!@\xFC\xBBҚ\xF1\xEB\xF4'\x88\x9F`WZ ~\xBD\x80\xFE\x84\xF1\xECJkįП ~\x82]iM\x80\xF8\xF5\xFA\xC4O\xB0+\xAD \xBF^@B\x80\xF8 v\xA55\x81\xB7_\xFF\xFBX\xBF\xE1\xB7\xFD?\xBE\xF9\xB7\xDF\xDF\xFA\x9F/\xBF\xFF\xEDߦ"\xBF\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\xE2/*\xB2\xF3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCE \xFE\xF9\x89 \xB8Q\x91\x9D'@\xFC\xF3;p \xFE\xA2";O\x80\xF8\xE7'v\xE0"@\xFCEEv\x9E\xF1\xCFO\xEC\xC0E\x80\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\xE2/*\xB2\xF
3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCE \xFE\xF9\x89 \xB8Q\x91\x9D'@\xFC\xF3;p \xFE\xA2";O\x80\xF8\xE7'v\xE0"@\xFCEEv\x9E\xF1\xCFO\xEC\xC0E\x80\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\xE2/*\xB2\xF3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCE \xFE\xF9\x89 \xB8Q\x91\x9D'@\xFC\xF3;p \xFE\xA2";O\x80\xF8\xE7'v\xE0"@\xFCEEv\x9E\xF1\xCFO\xEC\xC0E\x80\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\xE2/*\xB2\xF3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCE \xFE\xF9\x89 \xB8Q\x91\x9D'@\xFC\xF3;p \xFE\xA2";O\x80\xF8\xE7'v\xE0"@\xFCEEv\x9E\xF1\xCFO\xEC\xC0E\x80\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\xE2/*\xB2\xF3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCE \xFE\xF9\x89 \xB8Q\x91\x9D'@\xFC\xF3;p \xFE\xA2";O\x80\xF8\xE7'v\xE0"@\xFCEEv\x9E\xF1\xCFO\xEC\xC0E\x80\xF8\x8B\x8A\xEC<⟟\x8B\xF1\xD9y\xC4??\xB1\x
E2/*\xB2\xF3\x88~b.\xC4_Td\xE7 \xFF\xFC\xC4\\x88\xBF\xA8\xC8\xCEx|\xF9\xEB\xE5\xF5\x99\xAF\xFC\xFC\xEF?\xCF\xFC\xBC\xA7\xDB\xE3\xDD\xE3\xE9\xDFX<\xD0/~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\x80\xF8\xF9 P ~A]gN\xE0'v~3\xD5\xE4\xF75IEND\xAEB`\x82
\ No newline at end of file
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193887 => 193888)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-10 03:16:45 UTC (rev 193887)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-10 03:16:48 UTC (rev 193888)
@@ -1,5 +1,34 @@
2015-12-09 Simon Fraser <simon.fra...@apple.com>
+ Merge r191590. rdar://problem/23432368
+
+ 2015-10-26 Simon Fraser <simon.fra...@apple.com>
+
+ Implement 'round' and 'space' values for border-image
+ https://bugs.webkit.org/show_bug.cgi?id=14185
+
+ Reviewed by Tim Horton.
+
+ Add support for "round" and "space" values for border-image-repeat.
+ Following "stretch" and "repeat", the code is added to Image::drawTiled().
+
+ For "round", we compute an integral number of copies of the image that fit,
+ and then adjust the tile scale.
+
+ For "space", we also compute an integral number N of copies that will fit,
+ and then divide the remaining space amongst N+1 gaps, adjusting the tiling
+ phase so that with an even number of images, a gap is centered.
+
+ Tests: fast/borders/border-image-round.html
+ fast/borders/border-image-space.html
+
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::drawTiled):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::drawPattern):
+
+2015-12-09 Simon Fraser <simon.fra...@apple.com>
+
Merge r190914. rdar://problem/23432368
2015-10-12 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp (193887 => 193888)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp 2015-12-10 03:16:45 UTC (rev 193887)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp 2015-12-10 03:16:48 UTC (rev 193888)
@@ -213,27 +213,73 @@
return;
}
- // FIXME: We do not support 'round' or 'space' yet. For now just map them to 'repeat'.
- if (hRule == RoundTile || hRule == SpaceTile)
- hRule = RepeatTile;
- if (vRule == RoundTile || vRule == SpaceTile)
- vRule = RepeatTile;
+ FloatSize tileScale = tileScaleFactor;
+ FloatSize spacing;
+
+ // FIXME: These rules follow CSS border-image rules, but they should not be down here in Image.
+ bool centerOnGapHorizonally = false;
+ bool centerOnGapVertically = false;
+ switch (hRule) {
+ case RoundTile: {
+ int numItems = std::max<int>(floorf(dstRect.width() / srcRect.width()), 1);
+ tileScale.setWidth(dstRect.width() / (srcRect.width() * numItems));
+ break;
+ }
+ case SpaceTile: {
+ int numItems = floorf(dstRect.width() / srcRect.width());
+ if (!numItems)
+ return;
+ spacing.setWidth((dstRect.width() - srcRect.width() * numItems) / (numItems + 1));
+ tileScale.setWidth(1);
+ centerOnGapHorizonally = !(numItems & 1);
+ break;
+ }
+ case StretchTile:
+ case RepeatTile:
+ break;
+ }
- AffineTransform patternTransform = AffineTransform().scaleNonUniform(tileScaleFactor.width(), tileScaleFactor.height());
+ switch (vRule) {
+ case RoundTile: {
+ int numItems = std::max<int>(floorf(dstRect.height() / srcRect.height()), 1);
+ tileScale.setHeight(dstRect.height() / (srcRect.height() * numItems));
+ break;
+ }
+ case SpaceTile: {
+ int numItems = floorf(dstRect.height() / srcRect.height());
+ if (!numItems)
+ return;
+ spacing.setHeight((dstRect.height() - srcRect.height() * numItems) / (numItems + 1));
+ tileScale.setHeight(1);
+ centerOnGapVertically = !(numItems & 1);
+ break;
+ }
+ case StretchTile:
+ case RepeatTile:
+ break;
+ }
+ AffineTransform patternTransform = AffineTransform().scaleNonUniform(tileScale.width(), tileScale.height());
+
// We want to construct the phase such that the pattern is centered (when stretch is not
// set for a particular rule).
- float hPhase = tileScaleFactor.width() * srcRect.x();
- float vPhase = tileScaleFactor.height() * srcRect.y();
- float scaledTileWidth = tileScaleFactor.width() * srcRect.width();
- float scaledTileHeight = tileScaleFactor.height() * srcRect.height();
- if (hRule == Image::RepeatTile)
+ float hPhase = tileScale.width() * srcRect.x();
+ float vPhase = tileScale.height() * srcRect.y();
+ float scaledTileWidth = tileScale.width() * srcRect.width();
+ float scaledTileHeight = tileScale.height() * srcRect.height();
+
+ if (centerOnGapHorizonally)
+ hPhase -= spacing.width();
+ else if (hRule == Image::RepeatTile || hRule == Image::SpaceTile)
hPhase -= (dstRect.width() - scaledTileWidth) / 2;
- if (vRule == Image::RepeatTile)
- vPhase -= (dstRect.height() - scaledTileHeight) / 2;
+
+ if (centerOnGapVertically)
+ vPhase -= spacing.height();
+ else if (vRule == Image::RepeatTile || vRule == Image::SpaceTile)
+ vPhase -= (dstRect.height() - scaledTileHeight) / 2;
+
FloatPoint patternPhase(dstRect.x() - hPhase, dstRect.y() - vPhase);
-
- drawPattern(ctxt, srcRect, patternTransform, patternPhase, FloatSize(), styleColorSpace, op, dstRect);
+ drawPattern(ctxt, srcRect, patternTransform, patternPhase, spacing, styleColorSpace, op, dstRect);
#if PLATFORM(IOS)
startAnimation(DoNotCatchUp);
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp (193887 => 193888)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-12-10 03:16:45 UTC (rev 193887)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-12-10 03:16:48 UTC (rev 193888)
@@ -137,9 +137,11 @@
// fall back to the less efficient CGPattern-based mechanism.
float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
float w = CGImageGetWidth(tileImage);
- if (w == size().width() && h == size().height() && !spacing.width() && !spacing.height())
+ if (w == size().width() && h == size().height() && !spacing.width() && !spacing.height()) {
+ // FIXME: CG seems to snap the images to integral sizes. When we care (e.g. with border-image-repeat: round),
+ // we should tile all but the last, and stetch the last image to fit.
CGContextDrawTiledImage(context, FloatRect(adjustedX, adjustedY, scaledTileWidth, scaledTileHeight), subImage.get());
- else {
+ } else {
static const CGPatternCallbacks patternCallbacks = { 0, drawPatternCallback, patternReleaseCallback };
CGAffineTransform matrix = CGAffineTransformMake(narrowPrecisionToCGFloat(patternTransform.a()), 0, 0, narrowPrecisionToCGFloat(patternTransform.d()), adjustedX, adjustedY);
matrix = CGAffineTransformConcat(matrix, CGContextGetCTM(context));
