From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 30 Jul 2010 10:46:49 +0100 Subject: Merge WebKit at r64264 : Initial merge by git. Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1 --- .../DeviceOrientation/window-property-expected.txt | 18 ++++ .../fast/text/hyphenate-character-expected.txt | 118 +++++++++++++++++++++ .../android/fast/text/hyphens-expected.txt | 115 ++++++++++++++++++++ 3 files changed, 251 insertions(+) create mode 100644 LayoutTests/platform/android-v8/fast/dom/DeviceOrientation/window-property-expected.txt create mode 100644 LayoutTests/platform/android/fast/text/hyphenate-character-expected.txt create mode 100644 LayoutTests/platform/android/fast/text/hyphens-expected.txt (limited to 'LayoutTests/platform') diff --git a/LayoutTests/platform/android-v8/fast/dom/DeviceOrientation/window-property-expected.txt b/LayoutTests/platform/android-v8/fast/dom/DeviceOrientation/window-property-expected.txt new file mode 100644 index 0000000..900c9ca --- /dev/null +++ b/LayoutTests/platform/android-v8/fast/dom/DeviceOrientation/window-property-expected.txt @@ -0,0 +1,18 @@ +Tests that the window.DeviceOrientationEvent and window.ondeviceorientation properties are present. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +FAIL typeof window.DeviceOrientationEvent == 'object' should be true. Was false. +FAIL typeof window.DeviceOrientationEvent == 'function' should be false. Was true. +PASS hasDeviceOrientationEventProperty() is true +PASS 'DeviceOrientationEvent' in window is true +PASS window.hasOwnProperty('DeviceOrientationEvent') is true +PASS typeof window.ondeviceorientation == 'object' is true +PASS hasOnDeviceOrientationProperty() is true +PASS 'ondeviceorientation' in window is true +FAIL window.hasOwnProperty('ondeviceorientation') should be true. Was false. +PASS successfullyParsed is true + +TEST COMPLETE + diff --git a/LayoutTests/platform/android/fast/text/hyphenate-character-expected.txt b/LayoutTests/platform/android/fast/text/hyphenate-character-expected.txt new file mode 100644 index 0000000..1ed68b7 --- /dev/null +++ b/LayoutTests/platform/android/fast/text/hyphenate-character-expected.txt @@ -0,0 +1,118 @@ +layer at (0,0) size 356x1211 + RenderView at (0,0) size 313x483 +layer at (0,0) size 356x1211 + RenderBlock {HTML} at (0,0) size 313x483 + RenderBody {BODY} at (8,8) size 297x467 + RenderBlock (floating) {DIV} at (4,0) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "The initial value (should be like " + RenderInline {TT} at (0,0) size 32x15 + RenderText {#text} at (227,4) size 32x15 + text run at (227,4) width 32: "auto" + RenderText {#text} at (259,0) size 5x19 + text run at (259,0) width 5: ")" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in manag" + text run at (7,49) width 79: "ing her " + text run at (86,49) width 166: "flamingo: she suc" + text run at (7,70) width 245: "ceeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" + RenderBlock (floating) {DIV} at (4,296) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderText {#text} at (0,0) size 91x19 + text run at (0,0) width 91: "The default (" + RenderInline {TT} at (0,0) size 198x15 + RenderText {#text} at (91,4) size 198x15 + text run at (91,4) width 198: "hyphenate-character: auto" + RenderText {#text} at (289,0) size 5x19 + text run at (289,0) width 5: ")" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in manag" + text run at (7,49) width 79: "ing her " + text run at (86,49) width 166: "flamingo: she suc" + text run at (7,70) width 245: "ceeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" + RenderBlock (floating) {DIV} at (4,592) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "Bullet (" + RenderInline {TT} at (0,0) size 221x15 + RenderText {#text} at (51,4) size 221x15 + text run at (51,4) width 221: "hyphenate-character: \"\\2022\"" + RenderText {#text} at (272,0) size 5x19 + text run at (272,0) width 5: ")" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in manag" + text run at (7,49) width 78: "ing her " + text run at (85,49) width 167: "flamingo: she suc" + text run at (7,70) width 245: "ceeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" + RenderBlock (floating) {DIV} at (4,888) size 344x315 + RenderBlock {P} at (0,16) size 344x38 + RenderText {#text} at (0,0) size 156x19 + text run at (0,0) width 156: "Middle dot and tilde (" + RenderInline {TT} at (0,0) size 314x34 + RenderText {#text} at (156,4) size 314x34 + text run at (156,4) width 158: "hyphenate-character:" + text run at (0,23) width 47: "\"\\B7~\"" + RenderText {#text} at (47,19) size 5x19 + text run at (47,19) width 5: ")" + RenderBlock {DIV} at (0,70) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in manag" + text run at (7,49) width 74: "ing her " + text run at (81,49) width 171: "flamingo: she suc" + text run at (7,70) width 245: "ceeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" diff --git a/LayoutTests/platform/android/fast/text/hyphens-expected.txt b/LayoutTests/platform/android/fast/text/hyphens-expected.txt new file mode 100644 index 0000000..e68f861 --- /dev/null +++ b/LayoutTests/platform/android/fast/text/hyphens-expected.txt @@ -0,0 +1,115 @@ +layer at (0,0) size 356x1213 + RenderView at (0,0) size 313x483 +layer at (0,0) size 356x1213 + RenderBlock {HTML} at (0,0) size 313x483 + RenderBody {BODY} at (8,8) size 297x467 + RenderBlock (floating) {DIV} at (4,0) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderInline {TT} at (0,0) size 118x15 + RenderText {#text} at (0,4) size 118x15 + text run at (0,4) width 118: "hyphens: manual" + RenderText {#text} at (118,0) size 157x19 + text run at (118,0) width 157: " without soft hyphens" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in" + text run at (7,49) width 128: "managing her " + text run at (135,49) width 117: "flamingo: she" + text run at (7,70) width 245: "succeeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" + RenderBlock (floating) {DIV} at (4,296) size 344x317 + RenderBlock {P} at (0,16) size 344x19 + RenderInline {TT} at (0,0) size 103x15 + RenderText {#text} at (0,4) size 103x15 + text run at (0,4) width 103: "hyphens: none" + RenderText {#text} at (103,0) size 133x19 + text run at (103,0) width 133: " with soft hyphens" + RenderBlock {DIV} at (0,51) size 344x266 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x252 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in" + text run at (7,49) width 128: "managing her " + text run at (135,49) width 117: "flamingo: she" + text run at (7,70) width 141: "succeeded in get" + text run at (148,70) width 104: "ting its body" + text run at (7,91) width 181: "tucked away, com" + text run at (188,91) width 64: "fortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 289: "had got its neck nicely straight" + text run at (296,154) width 41: "ened" + text run at (7,175) width 330: "out, and was going to give the" + text run at (7,196) width 50: "hedge" + text run at (57,196) width 280: "hog a blow with its head, it" + text run at (7,217) width 330: "would twist itself round and look up in" + text run at (7,238) width 81: "her face\x{2026}" + RenderBlock (floating) {DIV} at (4,613) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderInline {TT} at (0,0) size 118x15 + RenderText {#text} at (0,4) size 118x15 + text run at (0,4) width 118: "hyphens: manual" + RenderText {#text} at (118,0) size 133x19 + text run at (118,0) width 133: " with soft hyphens" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in" + text run at (7,49) width 128: "managing her " + text run at (135,49) width 117: "flamingo: she" + text run at (7,70) width 141: "succeeded in get" + text run at (148,70) width 104: "ting its body" + text run at (7,91) width 146: "tucked away, " + text run at (153,91) width 35: "com" + text run at (188,91) width 64: "fortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 251: "had got its neck nicely straight" + text run at (258,154) width 47: "ened " + text run at (305,154) width 32: "out," + text run at (7,175) width 281: "and was going to give the hedge" + text run at (288,175) width 49: "hog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" + RenderBlock (floating) {DIV} at (4,909) size 344x296 + RenderBlock {P} at (0,16) size 344x19 + RenderInline {TT} at (0,0) size 103x15 + RenderText {#text} at (0,4) size 103x15 + text run at (0,4) width 103: "hyphens: auto" + RenderText {#text} at (103,0) size 157x19 + text run at (103,0) width 157: " without soft hyphens" + RenderBlock {DIV} at (0,51) size 344x245 [border: (3px solid #000000)] + RenderBlock (floating) {DIV} at (262,7) size 75x90 [bgcolor=#F0F8FF] + RenderText {#text} at (7,7) size 330x231 + text run at (7,7) width 245: "The chief difficulty Alice" + text run at (7,28) width 245: "found at first was in manag" + text run at (7,49) width 79: "ing her " + text run at (86,49) width 166: "flamingo: she suc" + text run at (7,70) width 245: "ceeded in getting its body" + text run at (7,91) width 147: "tucked away, " + text run at (154,91) width 98: "comfortably" + text run at (7,112) width 330: "enough, under her arm, with its legs" + text run at (7,133) width 125: "hanging down, " + text run at (132,133) width 205: "but generally, just as she" + text run at (7,154) width 298: "had got its neck nicely straightened " + text run at (305,154) width 32: "out," + text run at (7,175) width 330: "and was going to give the hedgehog a" + text run at (7,196) width 186: "blow with its head, it " + text run at (193,196) width 144: "would twist itself" + text run at (7,217) width 260: "round and look up in her face\x{2026}" -- cgit v1.1