Skip to content
Browse files

Initial commit for PlayBook Release 2.1.0

  • Loading branch information...
1 parent 1ba6b49 commit 9703e78e5c8e65e4ab289cedbcef9c764756b1d5 Ming Xie committed
Showing with 73,609 additions and 1,418 deletions.
  1. +7 −7 .gitattributes
  2. +49 −1 .gitignore
  3. +4,296 −3 ChangeLog
  4. +54 −13 GNUmakefile.am
  5. +64,299 −10 LayoutTests/ChangeLog
  6. +1 −1 LayoutTests/accessibility/aria-describedby-on-input.html
  7. +1 −1 LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt
  8. +1 −1 LayoutTests/accessibility/aria-labelledby-overrides-label.html
  9. +2 −2 LayoutTests/accessibility/aria-option-role.html
  10. +3 −1 LayoutTests/accessibility/non-data-table-cell-title-ui-element.html
  11. +21 −2 LayoutTests/accessibility/radio-button-title-label-expected.txt
  12. +40 −13 LayoutTests/accessibility/radio-button-title-label.html
  13. +19 −4 LayoutTests/accessibility/textarea-insertion-point-line-number-expected.txt
  14. +40 −18 LayoutTests/accessibility/textarea-insertion-point-line-number.html
  15. +1 −2 LayoutTests/accessibility/th-as-title-ui.html
  16. +1 −1 LayoutTests/animations/animation-css-rule-types-expected.txt
  17. +3 −3 LayoutTests/animations/animation-drt-api-multiple-keyframes.html
  18. BIN LayoutTests/animations/missing-values-first-keyframe-expected.png
  19. +100 −3 LayoutTests/animations/resources/animation-test-helpers.js
  20. +2 −2 LayoutTests/animations/script-tests/animation-css-rule-types.js
  21. BIN LayoutTests/animations/suspend-transform-animation-expected.png
  22. +1 −1 LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt
  23. +1 −1 LayoutTests/canvas/philip/tests/2d.pattern.image.undefined-expected.txt
  24. BIN LayoutTests/compositing/geometry/ancestor-overflow-change-expected.png
  25. +19 −15 LayoutTests/compositing/geometry/clipped-video-controller.html
  26. +1 −1 LayoutTests/compositing/geometry/fixed-position-composited-switch.html
  27. +1 −0 LayoutTests/compositing/geometry/fixed-position.html
  28. +1 −0 LayoutTests/compositing/geometry/horizontal-scroll-composited.html
  29. +1 −0 LayoutTests/compositing/geometry/vertical-scroll-composited.html
  30. +19 −13 LayoutTests/compositing/geometry/video-fixed-scrolling.html
  31. +17 −16 LayoutTests/compositing/geometry/video-opacity-overlay.html
  32. BIN LayoutTests/compositing/iframes/composited-iframe-scroll-expected.png
  33. BIN LayoutTests/compositing/iframes/iframe-content-flipping-expected.png
  34. BIN LayoutTests/compositing/images/direct-pdf-image-expected.png
  35. BIN LayoutTests/compositing/images/direct-svg-image-expected.png
  36. +17 −15 LayoutTests/compositing/layers-inside-overflow-scroll.html
  37. BIN LayoutTests/compositing/masks/layer-mask-placement-expected.png
  38. BIN LayoutTests/compositing/overflow/clip-content-under-overflow-controls-expected.png
  39. +1 −0 LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html
  40. BIN LayoutTests/compositing/overflow/repaint-after-losing-scrollbars-expected.png
  41. +19 −17 LayoutTests/compositing/overflow/scroll-ancestor-update.html
  42. +6 −14 LayoutTests/compositing/reflections/load-video-in-reflection.html
  43. BIN LayoutTests/compositing/reflections/remove-add-reflection-expected.png
  44. +4 −2 LayoutTests/compositing/repaint/become-overlay-composited-layer.html
  45. +2 −1 LayoutTests/compositing/scaling/tiled-layer-recursion.html
  46. BIN LayoutTests/compositing/scrollbar-painting-expected.png
  47. +18 −16 LayoutTests/compositing/self-painting-layers.html
  48. BIN LayoutTests/compositing/tiling/constrained-layer-size-expected.png
  49. +1 −1 LayoutTests/compositing/video/video-with-invalid-source.html
  50. BIN LayoutTests/compositing/visibility/visibility-image-layers-expected.png
  51. +39 −42 LayoutTests/css3/calc/simple-calcs-expected.txt
  52. +0 −9 LayoutTests/css3/calc/simple-calcs.html
  53. BIN LayoutTests/css3/filters/add-filter-rendering-expected.png
  54. +84 −58 LayoutTests/css3/filters/filter-property-computed-style-expected.txt
  55. +219 −68 LayoutTests/css3/filters/filter-property-parsing-expected.txt
  56. +29 −34 LayoutTests/css3/filters/filter-property-parsing-invalid-expected.txt
  57. +19 −3 LayoutTests/css3/filters/script-tests/custom-filter-property-parsing-invalid.js
  58. +86 −64 LayoutTests/css3/filters/script-tests/filter-property-computed-style.js
  59. +21 −22 LayoutTests/css3/filters/script-tests/filter-property-parsing-invalid.js
  60. +123 −62 LayoutTests/css3/filters/script-tests/filter-property-parsing.js
  61. BIN LayoutTests/css3/filters/simple-filter-rendering-expected.png
  62. +3 −0 LayoutTests/css3/flexbox/004-expected.txt
  63. +14 −0 LayoutTests/css3/flexbox/004.html
  64. +140 −5 LayoutTests/css3/flexbox/css-properties-expected.txt
  65. +10 −0 LayoutTests/css3/flexbox/flex-align-expected.txt
  66. +42 −42 LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html
  67. +118 −37 LayoutTests/css3/flexbox/flex-align.html
  68. +64 −0 LayoutTests/css3/flexbox/flex-flow-border-expected.txt
  69. +2 −3 LayoutTests/css3/flexbox/flex-flow-border.html
  70. +6 −0 LayoutTests/css3/flexbox/flex-flow-expected.txt
  71. +72 −0 LayoutTests/css3/flexbox/flex-flow-margins-auto-size-expected.txt
  72. +1 −2 LayoutTests/css3/flexbox/flex-flow-margins-auto-size.html
  73. +64 −0 LayoutTests/css3/flexbox/flex-flow-margins-expected.txt
  74. +2 −3 LayoutTests/css3/flexbox/flex-flow-margins.html
  75. +32 −0 LayoutTests/css3/flexbox/flex-flow-orientations-expected.txt
  76. +33 −2 LayoutTests/css3/flexbox/flex-flow-orientations.html
  77. +32 −0 LayoutTests/css3/flexbox/flex-flow-overflow-expected.txt
  78. +21 −7 LayoutTests/css3/flexbox/flex-flow-overflow.html
  79. +64 −0 LayoutTests/css3/flexbox/flex-flow-padding-expected.txt
  80. +3 −5 LayoutTests/css3/flexbox/flex-flow-padding.html
  81. +42 −0 LayoutTests/css3/flexbox/flex-flow.html
  82. +140 −13 LayoutTests/css3/flexbox/script-tests/css-properties.js
  83. +1 −1 LayoutTests/css3/font-feature-settings-parsing.html
  84. +2 −44 LayoutTests/css3/unicode-bidi-isolate-aharon.html
  85. +2 −1 LayoutTests/dom/xhtml/level2/html/HTMLIsIndexElement01-expected.txt
  86. +2 −1 LayoutTests/dom/xhtml/level2/html/HTMLIsIndexElement02-expected.txt
  87. +2 −1 LayoutTests/dom/xhtml/level2/html/HTMLIsIndexElement03-expected.txt
  88. +2 −2 LayoutTests/editing/input/resources/password-echo.js
  89. +1 −1 LayoutTests/editing/inserting/5994480-2-expected.txt
  90. +1 −1 LayoutTests/editing/pasteboard/data-transfer-items-expected.txt
  91. +22 −17 LayoutTests/editing/pasteboard/dataTransfer-setData-getData-expected.txt
  92. +1 −2 LayoutTests/editing/pasteboard/drag-drop-dead-frame.html
  93. +6 −7 LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
  94. +1 −1 LayoutTests/editing/pasteboard/paste-text-012-expected.txt
  95. +0 −3 LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
  96. +1 −2 LayoutTests/editing/pasteboard/testcase-9507-expected.txt
  97. +1 −0 LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html
  98. +3 −1 LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html
  99. +3 −1 LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html
  100. +3 −1 LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html
  101. +3 −1 LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html
  102. +3 −1 LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html
  103. +6 −6 LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element-expected.txt
  104. +9 −7 LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html
  105. +17 −12 LayoutTests/editing/selection/move-by-word-visually-multi-line-expected.txt
  106. +15 −13 LayoutTests/editing/selection/move-by-word-visually-multi-line.html
  107. +3 −1 LayoutTests/editing/selection/move-by-word-visually-multi-space.html
  108. +3 −1 LayoutTests/editing/selection/move-by-word-visually-null-box.html
  109. +1 −5 LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element-expected.txt
  110. +3 −1 LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html
  111. +3 −1 LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html
  112. +2 −2 LayoutTests/editing/selection/resources/move-by-word-visually.js
  113. +10 −0 LayoutTests/editing/selection/select-bidi-run-expected.txt
  114. +12 −0 LayoutTests/editing/selection/select-bidi-run.html
  115. +20 −7 LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
  116. +3 −0 LayoutTests/editing/spelling/spellcheck-paste-expected.txt
  117. +4 −1 LayoutTests/editing/spelling/spelling-unified-emulation.html
  118. +8 −8 LayoutTests/editing/text-iterator/basic-iteration-expected.txt
  119. +8 −8 LayoutTests/editing/text-iterator/script-tests/basic-iteration.js
  120. +3 −0 LayoutTests/fast/animation/request-animation-frame-during-modal.html
  121. +1 −1 LayoutTests/fast/animation/request-animation-frame-missing-arguments-expected.txt
  122. +1 −1 LayoutTests/fast/animation/request-animation-frame-missing-arguments.html
  123. +1 −1 LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
  124. +1 −1 LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
  125. BIN LayoutTests/fast/block/float/float-not-removed-from-next-sibling4-expected.png
  126. +1 −1 LayoutTests/fast/canvas/canvas-composite-canvas.html
  127. +1 −1 LayoutTests/fast/canvas/canvas-composite-image.html
  128. +9 −7 LayoutTests/fast/canvas/canvas-lineWidth.js
  129. +28 −28 LayoutTests/fast/canvas/canvas-strokePath-shadow-expected.txt
  130. +1 −0 LayoutTests/fast/canvas/canvas-webkitLineDash-expected.txt
  131. +2 −0 LayoutTests/fast/canvas/resize-while-save-active-expected.txt
  132. +1 −0 LayoutTests/fast/canvas/resources/canvas-composite-image-common.js
  133. +27 −36 LayoutTests/fast/canvas/script-tests/canvas-strokePath-shadow.js
  134. +6 −0 LayoutTests/fast/canvas/script-tests/canvas-webkitLineDash.js
  135. +1 −1 LayoutTests/fast/canvas/svg-taint-expected.txt
  136. +4 −1 LayoutTests/fast/canvas/webgl/WebGLContextEvent-expected.txt
  137. +22 −8 LayoutTests/fast/canvas/webgl/WebGLContextEvent.html
  138. +681 −100 LayoutTests/fast/canvas/webgl/array-message-passing-expected.txt
  139. +50 −0 LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt
  140. +26 −1 LayoutTests/fast/canvas/webgl/array-unit-tests.html
  141. +0 −1 LayoutTests/fast/canvas/webgl/constants.html
  142. +1 −1 LayoutTests/fast/canvas/webgl/context-destroyed-crash.html
  143. +2 −3 LayoutTests/fast/canvas/webgl/context-lost-expected.txt
  144. +17 −4 LayoutTests/fast/canvas/webgl/context-lost-restored-expected.txt
  145. +68 −31 LayoutTests/fast/canvas/webgl/context-lost-restored.html
  146. +27 −21 LayoutTests/fast/canvas/webgl/context-lost.html
  147. +501 −12 LayoutTests/fast/canvas/webgl/framebuffer-object-attachment-expected.txt
  148. +347 −79 LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html
  149. +1 −1 LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
  150. +1 −1 LayoutTests/fast/canvas/webgl/gl-get-calls.html
  151. +232 −0 LayoutTests/fast/canvas/webgl/object-deletion-behaviour-expected.txt
  152. +289 −2 LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html
  153. +33 −10 LayoutTests/fast/canvas/webgl/resources/webgl-test.js
  154. +35 −1 LayoutTests/fast/canvas/webgl/script-tests/array-message-passing.js
  155. BIN LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.png
  156. +1 −0 LayoutTests/fast/css/aspect-ratio-parsing-tests-expected.txt
  157. +1 −0 LayoutTests/fast/css/aspect-ratio-parsing-tests.html
  158. +4 −0 LayoutTests/fast/css/color-leakage.html
  159. +1 −1 LayoutTests/fast/css/counters/counter-cssText.html
  160. +1 −1 LayoutTests/fast/css/counters/getCounterValue.html
  161. +21 −6 LayoutTests/fast/css/css-selector-text-expected.txt
  162. +25 −6 LayoutTests/fast/css/css-selector-text.html
  163. +21 −6 LayoutTests/fast/css/css-set-selector-text-expected.txt
  164. +25 −6 LayoutTests/fast/css/css-set-selector-text.html
  165. +8 −16 LayoutTests/fast/css/custom-font-xheight.html
  166. +10 −0 LayoutTests/fast/css/font-face-default-font.html
  167. +2 −2 LayoutTests/fast/css/font-face-download-error.html
  168. +1 −1 LayoutTests/fast/css/font-face-in-shadow-DOM.html-disabled
  169. +4 −11 LayoutTests/fast/css/font-face-multiple-faces.html
  170. +1 −1 LayoutTests/fast/css/font-face-multiple-families.html
  171. +1 −5 LayoutTests/fast/css/font-face-multiple-remote-sources.html
  172. +1 −1 LayoutTests/fast/css/font-face-opentype.html
  173. +11 −5 LayoutTests/fast/css/font-face-remote.html
  174. +1 −1 LayoutTests/fast/css/font-face-repeated-url.html
  175. +5 −5 LayoutTests/fast/css/font-face-unicode-range.html
  176. +2 −2 LayoutTests/fast/css/font-face-unused-source-loaded.html
  177. +1 −8 LayoutTests/fast/css/font-face-woff.html
  178. +1 −1 LayoutTests/fast/css/font-face-zero-hash-key.html
  179. +32 −1 LayoutTests/fast/css/getComputedStyle/computed-style-border-image-expected.txt
  180. +39 −1 LayoutTests/fast/css/getComputedStyle/computed-style-border-image.html
  181. +17 −11 LayoutTests/fast/css/getComputedStyle/computed-style-cross-fade-expected.txt
  182. +19 −11 LayoutTests/fast/css/getComputedStyle/computed-style-cross-fade.html
  183. +13 −3 LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
  184. +16 −6 LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
  185. +5 −18 LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html
  186. +8 −19 LayoutTests/fast/css/getComputedStyle/computed-style.html
  187. +12 −2 LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-image-expected.txt
  188. +12 −1 LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-image.html
  189. +2 −2 LayoutTests/fast/css/getComputedStyle/getComputedStyle-margin-auto-expected.txt
  190. +3 −3 LayoutTests/fast/css/getComputedStyle/getComputedStyle-margin-percentage-expected.txt
  191. +4 −1 LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-expected.txt
  192. +4 −1 LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html
  193. +0 −6 LayoutTests/fast/css/stylesheet-candidate-nodes-crash-expected.txt
  194. +6 −6 LayoutTests/fast/css/stylesheet-candidate-nodes-crash.xhtml
  195. +40 −0 LayoutTests/fast/css/unknown-pseudo-element-matching-expected.txt
  196. +17 −3 LayoutTests/fast/css/unknown-pseudo-element-matching.html
  197. +1 −0 LayoutTests/fast/dom/Document/createAttributeNS-namespace-err-expected.txt
  198. +1 −0 LayoutTests/fast/dom/Document/script-tests/createAttributeNS-namespace-err.js
  199. +2 −2 LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
  200. +2 −2 LayoutTests/fast/dom/Element/scale-page-client-rects.html
  201. +0 −8 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-before-text-node-expected.txt
  202. +1 −1 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-before-text-node.html
  203. +0 −8 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-child-node-expected.txt
  204. +1 −1 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-child-node.html
  205. +0 −8 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-text-expected.txt
  206. +0 −8 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-text-form-control-expected.txt
  207. +1 −1 LayoutTests/fast/dom/HTMLElement/attr-dir-auto-change-text-form-control.html
Sorry, we could not display the entire diff because too many files (26,688) changed.
View
14 .gitattributes
@@ -187,6 +187,13 @@ LayoutTests/tables/mozilla_expected_failures/images/aboutHeader.gif -crlf
LayoutTests/tables/mozilla_expected_failures/images/main-horizontal-scroll.gif -crlf
LayoutTests/wml/resources/enter-card-with-events.wml -crlf
LayoutTests/wml/resources/enter-first-card-with-events.wml -crlf
+ManualTests/DOMContextMenuEvent.html -crlf
+ManualTests/cursor-max-size.html -crlf
+ManualTests/drag-with-div-or-image-as-data-image.html -crlf
+ManualTests/empty-script-crash.html -crlf
+ManualTests/remove-form-node-with-radio-buttons-crash.html -crlf
+ManualTests/select-delete-item.html -crlf
+ManualTests/textarea-caret-position-after-auto-spell-correct.html -crlf
PerformanceTests/PageLoad/svg/files/Harvey_Rayner.svg -crlf
PerformanceTests/PageLoad/svg/files/cacuts_02.svg -crlf
PerformanceTests/PageLoad/svg/files/crawfish2_ganson.svg -crlf
@@ -198,13 +205,6 @@ Source/WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
Source/WebCore/bindings/js/JSExceptionBase.cpp -crlf
Source/WebCore/bindings/js/JSExceptionBase.h -crlf
Source/WebCore/inspector/Inspector.json -crlf
-Source/WebCore/manual-tests/DOMContextMenuEvent.html -crlf
-Source/WebCore/manual-tests/cursor-max-size.html -crlf
-Source/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf
-Source/WebCore/manual-tests/empty-script-crash.html -crlf
-Source/WebCore/manual-tests/remove-form-node-with-radio-buttons-crash.html -crlf
-Source/WebCore/manual-tests/select-delete-item.html -crlf
-Source/WebCore/manual-tests/textarea-caret-position-after-auto-spell-correct.html -crlf
Source/WebCore/platform/chromium/SuddenTerminationChromium.cpp -crlf
Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp -crlf
Source/WebCore/platform/wx/wxcode/non-kerned-drawing.h -crlf
View
50 .gitignore
@@ -3,6 +3,7 @@
*.perspective*
*.pyc
.DS_Store
+.directory
.project
build/
build-arm/
@@ -37,6 +38,12 @@ Source/ThirdParty/glu/*.ninja
Source/ThirdParty/glu/*.sln
Source/ThirdParty/glu/*.vcproj
Source/ThirdParty/glu/glu.xcodeproj
+Source/WTF/WTF.gyp/*.Makefile
+Source/WTF/WTF.gyp/*.mk
+Source/WTF/WTF.gyp/*.ninja
+Source/WTF/WTF.gyp/*.sln
+Source/WTF/WTF.gyp/*.vcproj*
+Source/WTF/WTF.gyp/WTF.xcodeproj
Source/WebCore/WebCore.gyp/*.Makefile
Source/WebCore/WebCore.gyp/*.mk
Source/WebCore/WebCore.gyp/*.ninja
@@ -50,8 +57,27 @@ Source/WebKit/chromium/*.mk
Source/WebKit/chromium/*.ninja
Source/WebKit/chromium/*.sln
Source/WebKit/chromium/*.vcproj*
+Source/WebKit/chromium/All.xcodeproj
Source/WebKit/chromium/WebKit.xcodeproj
-Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
+Source/WebKit/chromium/WebKitUnitTests.xcodeproj
+Source/Platform/Platform.gyp/*.Makefile
+Source/Platform/Platform.gyp/*.mk
+Source/Platform/Platform.gyp/*.sln
+Source/Platform/Platform.gyp/*.vcproj*
+Source/Platform/Platform.gyp/*.xcodeproj*
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.Makefile
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.mk
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.ninja
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.sln
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.vcproj*
+Tools/DumpRenderTree/DumpRenderTree.gyp/*.xcodeproj*
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.Makefile
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.mk
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.ninja
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.sln
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.vcproj*
+Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.xcodeproj*
+
# Ignore status files that manage Chromium dependencies.
Source/WebKit/chromium/.gclient
@@ -64,6 +90,7 @@ Source/WebKit/chromium/base/
Source/WebKit/chromium/chromium_deps/
Source/WebKit/chromium/crypto/
Source/WebKit/chromium/depot_tools/
+Source/WebKit/chromium/dbus/
Source/WebKit/chromium/gfx/
Source/WebKit/chromium/googleurl/
Source/WebKit/chromium/gpu/
@@ -86,6 +113,7 @@ Source/WebKit/chromium/xcodebuild/
# Ignore files that Chromium port generates
/Makefile.chromium
/out
+/gyp-mac-tool
# Ignore compiled java tests:
LayoutTests/java/*.class
@@ -119,6 +147,8 @@ LayoutTests/java/*.class
# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary
/WebKitSupportLibrary.zip
/WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf
+/WebKitLibraries/win/WebKitAuxiliaryLibrary.headers
+/WebKitLibraries/win/WebKitAuxiliaryLibraryVersion
/WebKitLibraries/win/WebKitChangesToPthreads.diff
/WebKitLibraries/win/include/ApplicationServices/
/WebKitLibraries/win/include/AssertMacros.h
@@ -157,7 +187,25 @@ LayoutTests/java/*.class
/WebKitLibraries/win/lib/icuin.lib
/WebKitLibraries/win/lib/icuuc.lib
/WebKitLibraries/win/lib/libdispatch.lib
+/WebKitLibraries/win/lib/libicuin.lib
+/WebKitLibraries/win/lib/libicuuc.lib
/WebKitLibraries/win/lib/libxml2.lib
/WebKitLibraries/win/lib/libxslt.lib
/WebKitLibraries/win/lib/pthreadVC2.lib
/WebKitLibraries/win/lib/zdll.lib
+
+# Ignore files generated by the Qt build-system:
+Source/qtwebkitversion.h
+Tools/qmake/.build-hint
+
+# Ignore files generated by Qt Creator:
+*.pro.user
+
+# Ignore KDevelop files:
+.kdev_include_paths
+*.kdev4
+*.kate-swp
+
+# Ignore Eclipse files:
+.project
+.cproject
View
4,299 ChangeLog
4,296 additions, 3 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
67 GNUmakefile.am
@@ -55,6 +55,10 @@ IDL_BINDINGS :=
TEST_PROGS :=
POFILES :=
MOFILES :=
+dom_binding_idls :=
+wtf_cppflags:=
+wtf_cflags :=
+wtf_sources :=
javascriptcore_h_api :=
javascriptcore_cppflags:=
javascriptcore_cflags :=
@@ -76,10 +80,13 @@ webkitgtk_cppflags :=
webkitgtk_gdom_built_sources :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
+webkit2_sources :=
webkit2_built_sources :=
+webkit2_plugin_process_sources :=
webkit2_plugin_process_built_sources :=
webkittestrunner_built_sources :=
libwebcoreinternals_built_sources :=
+minibrowser_built_sources :=
global_cppflags :=
global_cflags :=
global_cxxflags :=
@@ -145,6 +152,13 @@ global_cppflags += \
-DXP_UNIX
endif
+# Use the wide character version of win32 API by default
+if TARGET_WIN32
+global_cppflags += \
+ -DUNICODE \
+ -D_UNICODE
+endif
+
if USE_ICU_UNICODE
global_cppflags += \
-DWTF_USE_ICU_UNICODE=1
@@ -165,6 +179,29 @@ global_cppflags += \
-DWTF_USE_GSTREAMER=1
endif
+if USE_ACCELERATED_COMPOSITING
+global_cppflags += \
+ -DWTF_USE_ACCELERATED_COMPOSITING=1 \
+ -DENABLE_3D_RENDERING=1
+endif
+
+if USE_TEXTURE_MAPPER_CAIRO
+global_cppflags += \
+ -DWTF_USE_TEXTURE_MAPPER=1 \
+ -DWTF_USE_TEXTURE_MAPPER_CAIRO=1
+endif
+
+if USE_TEXTURE_MAPPER_GL
+global_cppflags += \
+ -DWTF_USE_TEXTURE_MAPPER=1 \
+ -DWTF_USE_TEXTURE_MAPPER_GL=1
+endif
+
+if USE_CLUTTER
+global_cppflags += \
+ -DWTF_USE_CLUTTER=1
+endif
+
# ----
# GTK+ 2.x/3.x support
# ----
@@ -177,7 +214,6 @@ if !ENABLE_DEBUG
global_cppflags += -DNDEBUG
else
global_cppflags += \
- -DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@@ -198,40 +234,31 @@ EXTRA_DIST += \
$(srcdir)/Source/WebKit/LICENSE
# Include module makefiles
-if USE_JSC
+include Source/WTF/GNUmakefile.am
include Source/JavaScriptCore/GNUmakefile.am
-endif
-
include Source/WebCore/GNUmakefile.am
include Source/WebKit/gtk/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Tools/GNUmakefile.am
include Source/WebKit/gtk/po/GNUmakefile.am
-include Source/WebKit/gtk/docs/GNUmakefile.am
include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
-if ENABLE_WEBKIT2
include Source/WebKit2/GNUmakefile.am
include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
include Tools/MiniBrowser/gtk/GNUmakefile.am
include Tools/WebKitTestRunner/GNUmakefile.am
# [GTK] Refactor the translations now that we have webkit2
# https://bugs.webkit.org/show_bug.cgi?id=55153
-endif
# Autogenerated sources
BUILT_SOURCES += \
+ $(javascriptcore_built_sources) \
+ $(javascriptcore_built_nosources) \
$(webcore_built_sources) \
$(webcore_built_nosources) \
$(webkitgtk_built_sources) \
$(webkitgtk_built_nosources)
-if USE_JSC
-BUILT_SOURCES += \
- $(javascriptcore_built_sources) \
- $(javascriptcore_built_nosources)
-endif
-
DISTCLEANFILES += \
$(CLEANFILES) \
$(builddir)/doltcompile \
@@ -265,3 +292,17 @@ clean-local:
maintainer-clean-local: distclean-local
distclean-local:
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
+
+dist-hook: doc-dist-hook
+doc-dist-hook: docs-build.stamp
+ cp $(WebKit)/NEWS $(distdir)
+ @mkdir -p $(distdir)/Documentation/webkitgtk/html
+ @mkdir -p $(distdir)/Documentation/webkitgtk/tmpl
+ @-cp ./Documentation/webkitgtk/tmpl/*.sgml $(distdir)/Documentation/webkitgtk/tmpl
+ @cp ./Documentation/webkitgtk/html/* $(distdir)/Documentation/webkitgtk/html
+if ENABLE_WEBKIT2
+ @mkdir -p $(distdir)/Documentation/webkit2gtk/html
+ @mkdir -p $(distdir)/Documentation/webkit2gtk/tmpl
+ @-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
+ @cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
+endif
View
64,309 LayoutTests/ChangeLog
64,299 additions, 10 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 LayoutTests/accessibility/aria-describedby-on-input.html
@@ -15,7 +15,7 @@
var labeledItem = document.getElementById("time");
labeledItem.focus();
var result = document.getElementById("result");
- result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.description + "\"";
+ result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.helpText + "\"";
}
</script>
</body>
View
2 LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt
@@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS text.description is 'AXDescription: Shut down computer after 10 minutes'
-PASS text.titleUIElement().isValid is false
+PASS text.titleUIElement() != null && text.titleUIElement().isValid is false
PASS labelElement.role is 'AXRole: AXStaticText'
PASS successfullyParsed is true
View
2 LayoutTests/accessibility/aria-labelledby-overrides-label.html
@@ -25,7 +25,7 @@
shouldBe("text.description", "'AXDescription: Shut down computer after 10 minutes'");
// There should be no title UI element.
- shouldBe("text.titleUIElement().isValid", "false");
+ shouldBe("text.titleUIElement() != null && text.titleUIElement().isValid", "false");
// The label element is in a group, in a group, in the web area.
var labelElement = accessibilityController.rootElement.childAtIndex(0).childAtIndex(0).childAtIndex(0).childAtIndex(0);
View
4 LayoutTests/accessibility/aria-option-role.html
@@ -7,7 +7,7 @@
<div role="listbox">
<div role="option">option 1</div>
-<div role="option" title="label 2">option 2</div>
+<div role="option" aria-label="label 2">option 2</div>
</div>
<p id="description"></p>
@@ -29,7 +29,7 @@
shouldBe("firstChild.title", "'AXTitle: option 1'");
shouldBe("secondChild.role", "'AXRole: AXStaticText'");
- shouldBe("secondChild.title", "'AXTitle: label 2'");
+ shouldBe("secondChild.description", "'AXDescription: label 2'");
shouldBe("firstChild.childrenCount", "0");
shouldBe("secondChild.childrenCount", "0");
View
4 LayoutTests/accessibility/non-data-table-cell-title-ui-element.html
@@ -32,7 +32,9 @@
// get the <th>skip</th> element
var group = accessibilityController.focusedElement.childAtIndex(5);
var titleUI = group.titleUIElement();
- var allAttributes = titleUI.allAttributes();
+ var allAttributes = "";
+ if (titleUI)
+ allAttributes = titleUI.allAttributes();
// verify it has no title ui element
if (!allAttributes) {
View
23 LayoutTests/accessibility/radio-button-title-label-expected.txt
@@ -1,3 +1,22 @@
-Test passed
+This test checks that radio buttons expose title ui elements correctly under a variety of cirmcumstances. In general, the should disappear and act as the title for the radio button.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS focusedElement.title is 'AXTitle: LABEL'
+PASS !titleUIElement || titleUIElement.title == 'AXTitle: ' is true
+PASS focusedElement.description is 'AXDescription: LABEL2a'
+PASS focusedElement.title is 'AXTitle: '
+PASS !titleUIElement || titleUIElement.title == 'AXTitle: ' is true
+PASS focusedElement.description is 'AXDescription: radio3'
+PASS focusedElement.title is 'AXTitle: '
+PASS titleUIElement.title is 'AXTitle: '
+PASS successfullyParsed is true
+
+TEST COMPLETE
Test
-LABEL
+LABEL Test
+LABEL2
+LABEL2a
+Test
+LABEL3
View
53 LayoutTests/accessibility/radio-button-title-label.html
@@ -1,34 +1,61 @@
<html>
+<head>
+<script src="../fast/js/resources/js-test-pre.js"></script>
+</head>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
<body>
+
+<p id="description"></p>
+<div id="console"></div>
- <div id="result"></div>
-
- <!-- This test checks that if a radio button has a title and a title ui element label, both are exposed -->
<input type="radio" name="r1" id="r1" title="TITLE">Test<br>
<label for="r1">LABEL</label>
+ <input type="radio" id="r2" aria-labeledby="label3">Test<br>
+ <label for="r2">LABEL2</label>
+ <div id="label3">LABEL2a</div>
+
+ <input type="radio" name="r3" id="r3" aria-label="radio3">Test<br>
+ <label for="r3">LABEL3</label>
+
<script>
+
+ description("This test checks that radio buttons expose title ui elements correctly under a variety of cirmcumstances. In general, the <label> should disappear and act as the title for the radio button.");
+
if (window.accessibilityController) {
- var result = document.getElementById("result");
// radio button 1
- var r1 = document.getElementById("r1");
- r1.focus();
+ document.getElementById("r1").focus();
+
+ // 1) Even though a checkbox has a title attribute, the title ui element should still be exposed.
var focusedElement = accessibilityController.focusedElement;
var titleUIElement = focusedElement.titleUIElement();
+ shouldBe("focusedElement.title", "'AXTitle: LABEL'");
+ shouldBeTrue("!titleUIElement || titleUIElement.title == 'AXTitle: '");
+
+ // 2) aria-labeledby should override the native label semantics and return a title for the radio button, instead of a title ui element.
+ document.getElementById("r2").focus();
+ focusedElement = accessibilityController.focusedElement;
+ titleUIElement = focusedElement.titleUIElement();
+ shouldBe("focusedElement.description", "'AXDescription: LABEL2a'");
+ shouldBe("focusedElement.title", "'AXTitle: '");
+ shouldBeTrue("!titleUIElement || titleUIElement.title == 'AXTitle: '");
+
+ // 3) If a radio button has an aria-label and a <label>, the aria-label should be the title.
+ document.getElementById("r3").focus();
+ focusedElement = accessibilityController.focusedElement;
+ titleUIElement = focusedElement.titleUIElement();
+ shouldBe("focusedElement.description", "'AXDescription: radio3'");
+ shouldBe("focusedElement.title", "'AXTitle: '");
+ shouldBe("titleUIElement.title", "'AXTitle: '");
- var pattern = "AXTitle: TITLE";
- if (focusedElement.allAttributes().indexOf(pattern) != -1 && titleUIElement.allAttributes().length > 0) {
- result.innerText += "Test passed\n";
- }
- else {
- result.innerText += "Test failed\n";
- }
}
</script>
+
+<script src="../fast/js/resources/js-test-post.js"></script>
+
</body>
</html>
View
23 LayoutTests/accessibility/textarea-insertion-point-line-number-expected.txt
@@ -1,5 +1,20 @@
-Test:0) Line Number: Pass [0->0]
-Test:1) Line Number: Pass [7->1]
-Test:2) Line Number: Pass [14->2]
-Not focused on text area line number: -1
+This tests that lineNumberForPosition is reported correctly for textarea and contenteditable elements.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS area1.selectionStart = (0); area1.selectionEnd = (0); area1AXUIElement.insertionPointLineNumber; is currentLine
+PASS area1.selectionStart = (7); area1.selectionEnd = (7); area1AXUIElement.insertionPointLineNumber; is currentLine
+PASS area1.selectionStart = (14); area1.selectionEnd = (14); area1AXUIElement.insertionPointLineNumber; is currentLine
+PASS area2.focus(); area1AXUIElement.insertionPointLineNumber; is -1
+PASS window.getSelection().setBaseAndExtent(contenteditableLine1, 1, contenteditableLine1, 1); contenteditableAXUIElement.insertionPointLineNumber; is 0
+PASS contenteditableLine2.selectionStart = 1; contenteditableLine2.selectionEnd = 1;contenteditableAXUIElement.insertionPointLineNumber; is -1
+PASS window.getSelection().setBaseAndExtent(contenteditableLine3, 1, contenteditableLine3, 1); contenteditableAXUIElement.insertionPointLineNumber; is 2
+PASS textareaAXUIElement.insertionPointLineNumber is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Line1
+
+Line3
View
58 LayoutTests/accessibility/textarea-insertion-point-line-number.html
@@ -1,12 +1,11 @@
<html>
+<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
<body>
-
- <div id="result"></div>
-
+ <div id="console"></div>
<textarea name="area1" id="area1" rows="5" cols="40">
line 1
line 2
@@ -14,31 +13,54 @@
</textarea>
<textarea name="area2" id="area2" rows="5" cols="40"></textarea>
-
+
+
+ <div id="contenteditable-div" role="textbox" contenteditable="true" tabindex="0">
+ <div id="contenteditable-line1">Line1</div>
+ <textarea id="contenteditable-line2" rows="1" cols="40">Line2</textarea>
+ <div id="contenteditable-line3">Line3</div>
+ </div>
<script>
+ description("This tests that lineNumberForPosition is reported correctly for textarea and contenteditable elements.");
+
if (window.accessibilityController) {
- var result = document.getElementById("result");
+ var console = document.getElementById("console");
var area1 = document.getElementById("area1");
area1.focus();
+ var area1AXUIElement = accessibilityController.focusedElement;
+ var lineNumber = -2;
- for (var k = 0; k < 3; k++) {
- area1.selectionStart = (k*7);
- area1.selectionEnd = (k*7);
- var lineNumber = accessibilityController.focusedElement.insertionPointLineNumber;
- if (lineNumber == k) {
- result.innerText += "Test:" + k + ") Line Number: Pass [" + area1.selectionStart + "->" + lineNumber + "]\n";
- }
- else {
- result.innerText += "Test:" + k + ") Line Number: Fail [" + area1.selectionStart + "->" + lineNumber + "]\n";
- }
+ for (var currentLine = 0; currentLine < 3; currentLine++ ) {
+ shouldBe("area1.selectionStart = (" + (currentLine * 7) + "); " +
+ "area1.selectionEnd = (" + (currentLine * 7) +"); " +
+ "area1AXUIElement.insertionPointLineNumber;", "currentLine");
}
var area2 = document.getElementById("area2");
- area2.focus();
- var lineNumber = accessibilityController.focusedElement.insertionPointLineNumber
- result.innerText += "Not focused on text area line number: " + lineNumber + "\n";
+ shouldBe("area2.focus(); area1AXUIElement.insertionPointLineNumber;", "-1");
+
+ var contenteditableDiv = document.getElementById("contenteditable-div");
+ contenteditableDiv.focus();
+ var contenteditableAXUIElement = accessibilityController.focusedElement;
+
+ var contenteditableLine1 = document.getElementById("contenteditable-line1");
+ shouldBe("window.getSelection().setBaseAndExtent(contenteditableLine1, 1, contenteditableLine1, 1); " +
+ "contenteditableAXUIElement.insertionPointLineNumber;", "0");
+
+ var contenteditableLine2 = document.getElementById("contenteditable-line2");
+ shouldBe("contenteditableLine2.selectionStart = 1; contenteditableLine2.selectionEnd = 1;" +
+ "contenteditableAXUIElement.insertionPointLineNumber;", "-1");
+
+ var contenteditableLine3 = document.getElementById("contenteditable-line3");
+ shouldBe("window.getSelection().setBaseAndExtent(contenteditableLine3, 1, contenteditableLine3, 1); " +
+ "contenteditableAXUIElement.insertionPointLineNumber;", "2");
+
+ contenteditableLine2.focus();
+ var textareaAXUIElement = accessibilityController.focusedElement;
+ shouldBe("textareaAXUIElement.insertionPointLineNumber", "0");
}
</script>
+<script src="../fast/js/resources/js-test-post.js"></script>
</body>
</html>
View
3 LayoutTests/accessibility/th-as-title-ui.html
@@ -32,8 +32,7 @@
body.focus();
var group = accessibilityController.focusedElement.childAtIndex(1);
var group2 = accessibilityController.focusedElement.childAtIndex(3);
-
- if (group.titleUIElement().allAttributes() != "" && group2.titleUIElement().allAttributes() == "")
+ if (group.titleUIElement().allAttributes() != "" && (group2.titleUIElement() == null || group2.titleUIElement().allAttributes() == ""))
result.innerText += "Pass";
else
result.innerText += "Fail";
View
2 LayoutTests/animations/animation-css-rule-types-expected.txt
@@ -3,8 +3,8 @@ This test checks that the CSSRule RuleTypes for keyframe-related rules are what
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS ruleType is 7
PASS ruleType is 8
-PASS ruleType is 9
If we got to this point then we did not crash and the test has passed.
PASS successfullyParsed is true
View
6 LayoutTests/animations/animation-drt-api-multiple-keyframes.html
@@ -31,12 +31,12 @@
function animationStarted()
{
if (window.layoutTestController) {
- var paused = layoutTestController.pauseAnimationAtTimeOnElementWithId("anim", 3, "target");
- var result = "";
+ var paused = layoutTestController.pauseAnimationAtTimeOnElementWithId("anim", 1, "target");
+ var result;
if (paused)
result = "PASS: correctly paused animation";
else
- result = "PASS: correctly paused animation";
+ result = "FAIL: failed to pause animation";
document.getElementById('results').innerText = result;
layoutTestController.notifyDone();
View
BIN LayoutTests/animations/missing-values-first-keyframe-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
103 LayoutTests/animations/resources/animation-test-helpers.js
@@ -22,7 +22,8 @@ Function parameters:
[2] If a single string is passed, it is the id of the element to test. If an array with 2 elements is passed they
are the ids of 2 elements, whose values are compared for equality. In this case the expected value is ignored
- but the tolerance is used in the comparison.
+ but the tolerance is used in the comparison. If the second element is prefixed with "static:", no animation on that
+ element is required, allowing comparison with an unanimated "expected value" element.
If a string with a '.' is passed, this is an element in an iframe. The string before the dot is the iframe id
and the string after the dot is the element name in that iframe.
@@ -48,6 +49,46 @@ function matrixStringToArray(s)
return m[0].split(",");
}
+function parseCrossFade(s)
+{
+ var matches = s.match("-webkit-cross-fade\\((.*)\\s*,\\s*(.*)\\s*,\\s*(.*)\\)");
+
+ if (!matches)
+ return null;
+
+ return {"from": matches[1], "to": matches[2], "percent": parseFloat(matches[3])}
+}
+
+// Return an array of numeric filter params in 0-1.
+function getFilterParameters(s)
+{
+ var filterParams = s.match(/\((.+)\)/)[1];
+ var paramList = filterParams.split(' '); // FIXME: the spec may allow comma separation at some point.
+
+ // Normalize percentage values.
+ for (var i = 0; i < paramList.length; ++i) {
+ var param = paramList[i];
+ paramList[i] = parseFloat(paramList[i]);
+ if (param.indexOf('%') != -1)
+ paramList[i] = paramList[i] / 100;
+ }
+
+ return paramList;
+}
+
+function filterParametersMatch(paramList1, paramList2, tolerance)
+{
+ if (paramList1.length != paramList2.length)
+ return false;
+
+ for (var i = 0; i < paramList1.length; ++i) {
+ var match = isCloseEnough(paramList1[i], paramList2[i], tolerance);
+ if (!match)
+ return false;
+ }
+ return true;
+}
+
function checkExpectedValue(expected, index)
{
var animationName = expected[index][0];
@@ -59,6 +100,7 @@ function checkExpectedValue(expected, index)
// Check for a pair of element Ids
var compareElements = false;
+ var element2Static = false;
var elementId2;
if (typeof elementId != "string") {
if (elementId.length != 2)
@@ -66,6 +108,12 @@ function checkExpectedValue(expected, index)
elementId2 = elementId[1];
elementId = elementId[0];
+
+ if (elementId2.indexOf("static:") == 0) {
+ elementId2 = elementId2.replace("static:", "");
+ element2Static = true;
+ }
+
compareElements = true;
}
@@ -84,7 +132,7 @@ function checkExpectedValue(expected, index)
return;
}
- if (compareElements && animationName && hasPauseAnimationAPI && !layoutTestController.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId2)) {
+ if (compareElements && !element2Static && animationName && hasPauseAnimationAPI && !layoutTestController.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId2)) {
result += "FAIL - animation \"" + animationName + "\" is not running" + "<br>";
return;
}
@@ -110,7 +158,7 @@ function checkExpectedValue(expected, index)
pass = isCloseEnough(parseFloat(m1[i]), m2[i], tolerance);
if (!pass)
break;
- }
+ }
} else {
if (typeof expectedValue == "string")
pass = (computedValue == expectedValue);
@@ -126,6 +174,23 @@ function checkExpectedValue(expected, index)
}
}
}
+ } else if (property == "webkitFilter") {
+ var element;
+ if (iframeId)
+ element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+ else
+ element = document.getElementById(elementId);
+
+ computedValue = window.getComputedStyle(element).webkitFilter;
+ var filterParameters = getFilterParameters(computedValue);
+
+ if (compareElements) {
+ computedValue2 = window.getComputedStyle(document.getElementById(elementId2)).webkitFilter;
+ var filter2Parameters = getFilterParameters(computedValue2);
+ pass = filterParametersMatch(filterParameters, filter2Parameters, tolerance);
+ } else {
+ pass = filterParametersMatch(filterParameters, getFilterParameters(expectedValue), tolerance);
+ }
} else if (property == "lineHeight") {
var element;
if (iframeId)
@@ -140,6 +205,38 @@ function checkExpectedValue(expected, index)
}
else
pass = isCloseEnough(computedValue, expectedValue, tolerance);
+ } else if (property == "backgroundImage"
+ || property == "borderImageSource"
+ || property == "listStyleImage"
+ || property == "webkitMaskImage"
+ || property == "webkitMaskBoxImage") {
+ var element;
+ if (iframeId)
+ element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
+ else
+ element = document.getElementById(elementId);
+
+ computedValue = window.getComputedStyle(element)[property];
+ computedCrossFade = parseCrossFade(computedValue);
+
+ if (!computedCrossFade) {
+ pass = false;
+ } else {
+ if (compareElements) {
+ computedValue2 = window.getComputedStyle(document.getElementById(elementId2))[property];
+ computedCrossFade2 = parseCrossFade(computedValue2);
+ if (computedCrossFade2) {
+ pass = (isCloseEnough(computedCrossFade.percent, computedCrossFade2.percent, tolerance) &&
+ computedCrossFade.from == computedCrossFade2.from &&
+ computedCrossFade.to == computedCrossFade2.to);
+ }
+ else {
+ pass = false;
+ }
+ } else {
+ pass = isCloseEnough(computedCrossFade.percent, expectedValue, tolerance);
+ }
+ }
} else {
var element;
if (iframeId)
View
4 LayoutTests/animations/script-tests/animation-css-rule-types.js
@@ -3,9 +3,9 @@ description(
);
var ruleType = window.CSSRule.WEBKIT_KEYFRAMES_RULE;
-shouldBe("ruleType", "8");
+shouldBe("ruleType", "7");
ruleType = window.CSSRule.WEBKIT_KEYFRAME_RULE;
-shouldBe("ruleType", "9");
+shouldBe("ruleType", "8");
debug('If we got to this point then we did not crash and the test has passed.');
var successfullyParsed = true;
View
BIN LayoutTests/animations/suspend-transform-animation-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2 LayoutTests/canvas/philip/tests/2d.pattern.image.string-expected.txt
@@ -1 +1 @@
-Passed
+Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: Type error
View
2 LayoutTests/canvas/philip/tests/2d.pattern.image.undefined-expected.txt
@@ -1 +1 @@
-Passed
+Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: Type error
View
BIN LayoutTests/compositing/geometry/ancestor-overflow-change-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
34 LayoutTests/compositing/geometry/clipped-video-controller.html
@@ -1,10 +1,7 @@
<!DOCTYPE html>
-<html lang="en">
+<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Clipped Video</title>
-</head>
<style>
#box {
@@ -18,23 +15,30 @@
}
</style>
+ <script src="../resources/media-testing.js"></script>
+ <script src="../../media/media-file.js"></script>
+
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
- layoutTestController.waitUntilDone();
- </script>
+ layoutTestController.dumpAsText();
+
+ function testDone()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
-<body>
+ function doTest()
+ {
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, '../resources/video', null, testDone);
+ }
+ </script>
+</head>
+<body onload="doTest()">
<p>The video controller should not be visible below</p>
<div id="box">
<video controls></video>
</div>
- <script type="text/javascript" charset="utf-8">
- var video = document.getElementsByTagName('video')[0];
- video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- video.addEventListener('canplaythrough', function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
- </script>
</body>
</html>
View
2 LayoutTests/compositing/geometry/fixed-position-composited-switch.html
@@ -19,7 +19,7 @@
</style>
<script type="text/javascript" charset="utf-8">
if (window.internals)
- window.internals.setEnableCompositingForFixedPosition(document, true);
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
function doTest()
{
View
1 LayoutTests/compositing/geometry/fixed-position.html
@@ -5,6 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Position fixed</title>
+ <script src="../resources/mock_scrollbars.js"></script>
<style type="text/css" media="screen">
body {
height: 1000px;
View
1 LayoutTests/compositing/geometry/horizontal-scroll-composited.html
@@ -5,6 +5,7 @@
if (window.layoutTestController)
layoutTestController.waitUntilDone();
</script>
+ <script src="../resources/mock_scrollbars.js"></script>
</head>
<body style="width: 600px">
<div style="-webkit-transform: translatez(0); width: 1000px; height: 800px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
View
1 LayoutTests/compositing/geometry/vertical-scroll-composited.html
@@ -5,6 +5,7 @@
if (window.layoutTestController)
layoutTestController.waitUntilDone();
</script>
+ <script src="../resources/mock_scrollbars.js"></script>
</head>
<body style="height: 600px">
<div style="-webkit-transform: rotate3d(0,0,1,20deg); width: 800px; height: 1000px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
View
32 LayoutTests/compositing/geometry/video-fixed-scrolling.html
@@ -24,25 +24,31 @@
background-color: rgba(0, 0, 255, 0.8);
}
</style>
+ <script src="../resources/media-testing.js"></script>
+ <script src="../../media/media-file.js"></script>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ function testDone()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ function modifyDocument()
+ {
+ window.scrollBy(50, 50);
+ }
+
+ function doTest()
+ {
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, '../resources/video', modifyDocument, testDone);
+ }
</script>
</head>
-<body>
+<body onload="doTest()">
<video></video>
<p>The blue bar should be in front of the video, and at the top of the page.</p>
<div id="fixed-bar"></div>
-
- <script type="text/javascript" charset="utf-8">
- var video = document.getElementsByTagName('video')[0];
- video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- video.addEventListener('canplaythrough', function() {
- window.scrollBy(50, 50);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
- </script>
</body>
</html>
View
33 LayoutTests/compositing/geometry/video-opacity-overlay.html
@@ -1,10 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Video overlay</title>
- <style type="text/css" media="screen">
+ <style>
video {
width: 100%;
height: 100%;
@@ -33,12 +30,23 @@
background-color: orange;
}
</style>
+ <script src="../resources/media-testing.js"></script>
+ <script src="../../media/media-file.js"></script>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ function testDone()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ function doTest()
+ {
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, '../resources/video', null, testDone);
+ }
</script>
</head>
-<body>
+<body onload="doTest()">
<p>The orange bar should be in front of the video.</p>
<div class="container">
<video></video>
@@ -46,13 +54,6 @@
<div id="control-bar"></div>
</div>
</div>
- <script type="text/javascript" charset="utf-8">
- var video = document.getElementsByTagName('video')[0];
- video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- video.addEventListener('canplaythrough', function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
- </script>
+
</body>
</html>
View
BIN LayoutTests/compositing/iframes/composited-iframe-scroll-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN LayoutTests/compositing/iframes/iframe-content-flipping-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN LayoutTests/compositing/images/direct-pdf-image-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN LayoutTests/compositing/images/direct-svg-image-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
32 LayoutTests/compositing/layers-inside-overflow-scroll.html
@@ -33,30 +33,32 @@
-webkit-transform: translateZ(0);
}
</style>
- <script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ <script src="resources/media-testing.js"></script>
+ <script src="../media/media-file.js"></script>
- function testOnLoad()
+ <script type="text/javascript" charset="utf-8">
+ function testDone()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ function modifyDocument()
{
- window.setTimeout(function() {
document.getElementById('details').scrollTop = 100;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, 0);
}
- window.addEventListener('load', function() {
- var video = document.getElementById('video');
- video.addEventListener('loadeddata', testOnLoad, false);
- video.src = 'resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- }, false);
+ function doTest()
+ {
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, 'resources/video', modifyDocument, testDone);
+ }
</script>
</head>
- <body>
+ <body onload="doTest()">
<p>The red box in the overflow:scroll div should be scrolled out of view.</p>
<div id="container">
- <video id="video" width="300" height="200"></video>
+ <video width="300" height="200"></video>
</div>
<div id="details">
View
BIN LayoutTests/compositing/masks/layer-mask-placement-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN LayoutTests/compositing/overflow/clip-content-under-overflow-controls-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1 LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html
@@ -34,6 +34,7 @@
window.scrollBy(50, 50);
}, false);
</script>
+ <script src="../resources/mock_scrollbars.js"></script>
</head>
<body>
View
BIN LayoutTests/compositing/overflow/repaint-after-losing-scrollbars-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
36 LayoutTests/compositing/overflow/scroll-ancestor-update.html
@@ -50,18 +50,29 @@
background-color: red;
}
</style>
+
+ <script src="../resources/media-testing.js"></script>
+ <script src="../../media/media-file.js"></script>
<script type="text/javascript" charset="utf-8">
+ function testDone()
+ {
if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
- function scrollTestDiv()
- {
- var scroller = document.getElementById('scroller');
- scroller.scrollTop = 50;
- }
+ layoutTestController.notifyDone();
+ }
+
+ function modifyDocument()
+ {
+ document.getElementById('scroller').scrollTop = 50;
+ }
+
+ function doTest()
+ {
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, '../resources/video', modifyDocument, testDone);
+ }
</script>
</head>
-<body>
+<body onload="doTest()">
<div class="indicator box"></div>
@@ -76,14 +87,5 @@
<video></video>
- <script type="text/javascript" charset="utf-8">
- var video = document.getElementsByTagName('video')[0];
- video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- video.addEventListener('canplaythrough', function() {
- scrollTestDiv();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
- </script>
</body>
</html>
View
20 LayoutTests/compositing/reflections/load-video-in-reflection.html
@@ -20,31 +20,23 @@
}
</style>
+ <script src="../resources/media-testing.js"></script>
+ <script src="../../media/media-file.js"></script>
<script type="text/javascript" charset="utf-8">
-
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
- function videoLoaded()
+ function testDone()
{
if (window.layoutTestController)
layoutTestController.notifyDone();
}
- function runTest()
+ function doTest()
{
var video = document.getElementsByTagName('video')[0];
- video.addEventListener('canplaythrough', videoLoaded, false);
-
- window.setTimeout(function() {
- video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- }, 100);
+ setupVideo(video, '../resources/video', null, testDone);
}
-
- window.addEventListener('load', runTest, false)
</script>
</head>
-<body>
+<body onload="doTest()">
<p>You should see a reflected video below, rather than the red video background.</p>
<div class="container">
<video></video>
View
BIN LayoutTests/compositing/reflections/remove-add-reflection-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 LayoutTests/compositing/repaint/become-overlay-composited-layer.html
@@ -51,8 +51,10 @@
document.getElementById("container").className = "right";
window.setTimeout(function() {
document.getElementById("container").className = "";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ window.setTimeout(function() {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }, 250);
}, 250);
}
View
3 LayoutTests/compositing/scaling/tiled-layer-recursion.html
@@ -16,7 +16,8 @@
function scalePage()
{
- eventSender.scalePageBy(1.50025, 0, 0);
+ if (window.internals)
+ window.internals.settings.setPageScaleFactor(1.50025, 0, 0);
}
window.addEventListener('load', scalePage, false);
View
BIN LayoutTests/compositing/scrollbar-painting-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
34 LayoutTests/compositing/self-painting-layers.html
@@ -25,29 +25,31 @@
font-size: 24pt;
line-height: 150%;
}
-
</style>
+
+ <script src="resources/media-testing.js"></script>
+ <script src="../media/media-file.js"></script>
+
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ function testDone()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+
+ function modifyDocument()
+ {
+ document.getElementById('details').scrollTop = 24;
+ }
- function testOnLoad()
+ function doTest()
{
- window.setTimeout(function() {
- document.getElementById('details').scrollTop = 24;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, 0);
+ var video = document.getElementsByTagName('video')[0];
+ setupVideo(video, 'resources/video', modifyDocument, testDone);
}
-
- window.addEventListener('load', function() {
- var video = document.getElementById('video');
- video.addEventListener('loadeddata', testOnLoad, false);
- video.src = 'resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
- }, false);
</script>
</head>
- <body>
+ <body onload="doTest()">
<p>You should not see double text when the div scrolls</p>
<div id="container">
<video id="video" width="300" height="200"></video>
View
BIN LayoutTests/compositing/tiling/constrained-layer-size-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2 LayoutTests/compositing/video/video-with-invalid-source.html
@@ -9,7 +9,7 @@
var v = document.createElement("video");
document.body.appendChild(v);
var src = document.createElement("source");
- src.src = "notarealsource";
+ src.src = "notarealsource.txt";
v.appendChild(src);
src.addEventListener("error", function() {
if (window.layoutTestController) {
View
BIN LayoutTests/compositing/visibility/visibility-image-layers-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
81 LayoutTests/css3/calc/simple-calcs-expected.txt
@@ -1,49 +1,46 @@
All boxes below should be 100px * 100px and green.
control => PASS
-50px + 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-150px - 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + 50px (2 spaces around operator) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-150px - 50px (2 spaces around operator) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px*2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px *2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px* 2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-200px/2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-200px /2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-200px/ 2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px*(2) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px *(2) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px* (2) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px*(1 + 1) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px*(12 - 10) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px*(10 / 5) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-10px* (5 * 2) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px* (12 mod 10) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + 10px * 5 (operation order) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-1100px mod 1000 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-100%/2 (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
+50px + 50px => PASS
+150px - 50px => PASS
+50px + 50px (2 spaces around operator) => PASS
+150px - 50px (2 spaces around operator) => PASS
+50px*2 => PASS
+50px *2 => PASS
+50px* 2 => PASS
+200px/2 => PASS
+200px /2 => PASS
+200px/ 2 => PASS
+50px*(2) => PASS
+50px *(2) => PASS
+50px* (2) => PASS
+50px*(1 + 1) => PASS
+50px*(12 - 10) => PASS
+50px*(10 / 5) => PASS
+10px* (5 * 2) => PASS
+50px + 10px * 5 (operation order) => PASS
+100%/2 (where 100% is 200px) => PASS
100% + -100px (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
80% - 60px (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
300px - 100% (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-100px + 100% (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-20% + 30% (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-80% - 30% (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-10% * 5 (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-5 * 10% (where 100% is 200px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(100px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(50px + 50px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(50px) + 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + (50px) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + 25px * 2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(25px + 25px) * 2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-2 * 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-2 * 100px / 2 => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-12 mod 10 * 50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(1em - 1em) + 100px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-50px + +50px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
--50px + 150px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
--50px - -150px => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-(((((((100px))))))) => FAIL: @zoom=1 expected width of 100, but was 256; @zoom=1.2 expected width of 100, but was 256; @zoom=2 expected width of 100, but was 256
-100px => FAIL: @zoom=1 expected height of 100, but was 50; @zoom=1.2 expected height of 100, but was 50; @zoom=2 expected height of 100, but was 50
-100% * 2 => FAIL: @zoom=1 expected height of 100, but was 50; @zoom=1.2 expected height of 100, but was 50; @zoom=2 expected height of 100, but was 50
+20% + 30% (where 100% is 200px) => PASS
+80% - 30% (where 100% is 200px) => PASS
+10% * 5 (where 100% is 200px) => PASS
+5 * 10% (where 100% is 200px) => PASS
+(100px) => PASS
+(50px + 50px) => PASS
+(50px) + 50px => PASS
+50px + (50px) => PASS
+50px + 50px => PASS
+50px + 25px * 2 => PASS
+(25px + 25px) * 2 => PASS
+2 * 50px => PASS
+2 * 100px / 2 => PASS
+(1em - 1em) + 100px => PASS
+50px + +50px => PASS
+-50px + 150px => PASS
+-50px - -150px => PASS
+(((((((100px))))))) => PASS
+100px => PASS
+100% * 2 => PASS
View
9 LayoutTests/css3/calc/simple-calcs.html
@@ -36,9 +36,7 @@
<div class="width-test" style="width: -webkit-calc(50px*(12 - 10));">50px*(12 - 10)</div>
<div class="width-test" style="width: -webkit-calc(50px*(10 / 5));">50px*(10 / 5)</div>
<div class="width-test" style="width: -webkit-calc(10px* (5 * 2));">10px* (5 * 2)</div>
-<div class="width-test" style="width: -webkit-calc(50px* (12 mod 10));">50px* (12 mod 10)</div>
<div class="width-test" style="width: -webkit-calc(50px + 10px * 5);">50px + 10px * 5 (operation order)</div>
-<div class="width-test" style="width: -webkit-calc(1100px mod 1000);">1100px mod 1000</div>
<div style="width: 200px; background-color: white;" class="wrapper">
<div class="width-test" style="width: -webkit-calc(100%/2);">100%/2 (where 100% is 200px)</div>
</div>
@@ -66,12 +64,6 @@
<div style="width: 200px; background-color: white;" class="wrapper">
<div class="width-test" style="width: -webkit-calc(5 * 10%);">5 * 10% (where 100% is 200px)</div>
</div>
-<!--
- FIXME: what do we do with mod of percent?
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(75% mod 100);">150% mod 100 (where 100% is 200px)</div>
-</div>
--->
<div class="width-test" style="width: -webkit-calc((100px));">(100px)</div>
<div class="width-test" style="width: -webkit-calc((50px + 50px));">(50px + 50px)</div>
<div class="width-test" style="width: -webkit-calc((50px) + 50px);">(50px) + 50px</div>
@@ -81,7 +73,6 @@
<div class="width-test" style="width: -webkit-calc( (25px + 25px) * 2 );"> (25px + 25px) * 2 </div>
<div class="width-test" style="width: -webkit-calc(2 * 50px);">2 * 50px</div>
<div class="width-test" style="width: -webkit-calc(2 * 100px / 2);">2 * 100px / 2</div>
-<div class="width-test" style="width: -webkit-calc(12 mod 10 * 50px);">12 mod 10 * 50px</div>
<div class="width-test" style="width: -webkit-calc((1em - 1em) + 100px);">(1em - 1em) + 100px</div>
<div class="width-test" style="width: -webkit-calc(50px + +50px);">50px + +50px</div>
<div class="width-test" style="width: -webkit-calc(-50px + 150px);">-50px + 150px</div>
View
BIN LayoutTests/css3/filters/add-filter-rendering-expected.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
142 LayoutTests/css3/filters/filter-property-computed-style-expected.txt
@@ -233,85 +233,98 @@ PASS subRule.cssText is 'opacity(0.5)'
PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
PASS subRule.cssText is 'grayscale(0.25)'
-Three values : gamma(1 1 0)
+Integer value : brightness(1)
PASS filterStyle.length is 1
-PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GAMMA
-PASS subRule.cssText is 'gamma(1 1 0)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(1)'
-Two values : gamma(1 1)
+Float value converts to integer : brightness(1.0)
PASS filterStyle.length is 1
-PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GAMMA
-PASS subRule.cssText is 'gamma(1 1 0)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(1)'
-One value : gamma(1)
+Zero value : brightness(0)
PASS filterStyle.length is 1
-PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GAMMA
-PASS subRule.cssText is 'gamma(1 1 0)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0)'
-No values : gamma()
+No values : brightness()
PASS filterStyle.length is 1
-PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GAMMA
-PASS subRule.cssText is 'gamma(1 1 0)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0)'
-Float value : gamma(1.3)
-PASS filterStyle.length is 1
-PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GAMMA
-PASS subRule.cssText is 'gamma(1.3 1 0)'
+Multiple values : brightness(0.5) brightness(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.25)'
-Two zeros to px : blur(0 0)
-PASS filterSty