2011-02-04 Matthew Delaney <mdelaney@apple.com>

        Reviewed by Dan Bernstein.

        Move canvas layout test expectations into more appropriate locations
        https://bugs.webkit.org/show_bug.cgi?id=53145

        * platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt: Removed.
        * ...
        * platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt: Removed.
        * platform/mac/canvas: Added.
        * platform/mac/canvas/philip: Added.
        * platform/mac/canvas/philip/tests: Added.
        * platform/mac/canvas/philip/tests/2d.drawImage.broken-expected.txt: Copied from platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt.
        * ...
        * platform/mac/canvas/philip/tests/type.prototype-expected.txt: Copied from platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4bf2ffcdcb4d8ccfca119ceb9a03ff7b1a16f410..1c30fa7d1c5e92f838f01eb9fa65cd48d1633f3f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-04  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Move canvas layout test expectations into more appropriate locations
+        https://bugs.webkit.org/show_bug.cgi?id=53145
+
+        * platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt: Removed.
+        * ...
+        * platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt: Removed.
+        * platform/mac/canvas: Added.
+        * platform/mac/canvas/philip: Added.
+        * platform/mac/canvas/philip/tests: Added.
+        * platform/mac/canvas/philip/tests/2d.drawImage.broken-expected.txt: Copied from platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt.
+        * ...
+        * platform/mac/canvas/philip/tests/type.prototype-expected.txt: Copied from platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt.
+
 2011-02-04  Jessie Berlin  <jberlin@apple.com>
 
         [Windows 7 Release Tests] plugins/plugin-document-back-forward.html failing since

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.drawImage.broken-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.broken-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.drawImage.broken-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.system-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.system-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.system-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.system-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.cone.front-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.cone.front-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.cone.front-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.cone.front-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.cone.top-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.cone.top-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.cone.top-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.cone.top-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.inside2-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.inside2-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.inside2-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.inside2-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.inside3-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.inside3-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.inside3-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.inside3-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.outside1-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.outside1-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.gradient.radial.outside1-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.gradient.radial.outside1-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.create1.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.create1.type-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.create2.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.create2.type-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.type-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.cap.closed-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.line.cap.closed-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.cap.closed-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.line.cap.closed-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.join.parallel-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.line.join.parallel-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.join.parallel-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.line.join.parallel-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.miter.lineedge-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.line.miter.lineedge-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.line.miter.lineedge-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.line.miter.lineedge-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.missingargs-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.missingargs-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.missingargs-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.missingargs-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.path.rect.winding-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.path.rect.winding-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.path.rect.winding-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.path.rect.winding-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.broken-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.broken-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.broken-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.broken-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.blur-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.blur-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.x-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.x-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.x-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.x-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.y-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.y-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.y-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.shadow.enable.y-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.strokeRect.zero.4-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.strokeRect.zero.4-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.strokeRect.zero.4-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.strokeRect.zero.4-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.bottom-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.bottom-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.bottom-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.bottom-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.hanging-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.hanging-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.hanging-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.hanging-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.ideographic-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.ideographic-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.ideographic-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.ideographic-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.middle-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.middle-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.middle-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.middle-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.top-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.top-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.baseline.top-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.baseline.top-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.fill.maxWidth.fontface-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.end-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.end-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.end-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.end-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.nonspace-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.other-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.other-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.other-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.other-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.space-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.space-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.space-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.space-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.start-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.start-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.draw.space.collapse.start-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.draw.space.collapse.start-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.basic-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.basic-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.basic-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.basic-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.complex-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.complex-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.complex-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.complex-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.invalid-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.invalid-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.invalid-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.invalid-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.size.percentage-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.size.percentage-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.size.percentage-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.size.percentage-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.size.percentage.default-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.size.percentage.default-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.size.percentage.default-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.size.percentage.default-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.system-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.system-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.font.parse.system-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.font.parse.system-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.measure.width.space-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.text.measure.width.space-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.text.measure.width.space-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/2d.text.measure.width.space-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.canvas-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/security.drawImage.canvas-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.canvas-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/security.drawImage.canvas-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.image-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/security.drawImage.image-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.image-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/security.drawImage.image-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.reset-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/security.reset-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.reset-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/security.reset-expected.txt

diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/type.prototype-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/type.prototype-expected.txt
rename to LayoutTests/platform/mac/canvas/philip/tests/type.prototype-expected.txt