[Qt][WK2] REGRESSION(r119127): resetting window.internals settings between tests...
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jul 2012 07:10:06 +0000 (07:10 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jul 2012 07:10:06 +0000 (07:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=88064

Reviewed by Zoltan Herczeg.

Source/WebKit/qt:

Add missing DumpRenderTreeSupportQt::resetInternalsObject(JSContextRef context) function.

* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::resetInternalsObject):
* WebCoreSupport/DumpRenderTreeSupportQt.h:

Tools:

Use resetInternalsObject() instead of injectInternalsObject().

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::resetAfterTest):

LayoutTests:

* platform/qt-5.0-wk2/Skipped: Unskip now passing tests.

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

LayoutTests/ChangeLog
LayoutTests/platform/qt-5.0-wk2/Skipped
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index a2bd330..0b8137e 100644 (file)
@@ -1,3 +1,12 @@
+2012-07-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][WK2] REGRESSION(r119127): resetting window.internals settings between tests doesn't work properly
+        https://bugs.webkit.org/show_bug.cgi?id=88064
+
+        Reviewed by Zoltan Herczeg.
+
+        * platform/qt-5.0-wk2/Skipped: Unskip now passing tests.
+
 2012-07-26  Mike Lawther  <mikelawther@chromium.org>
 
         Make transitions work between different Length types
index 84af5f1..ee1aafa 100644 (file)
@@ -397,11 +397,6 @@ http/tests/ssl
 # https://bugs.webkit.org/show_bug.cgi?id=90985
 fast/repaint/background-scaling.html
 
-# [Qt][WK2] REGRESSION(r122376): It made 68 tests flakey (TEXT PASS)
-# https://bugs.webkit.org/show_bug.cgi?id=91063
-compositing/columns/geometry-map-paginated-assert.html
-fast/multicol/shrink-to-column-height-for-pagination.html
-
 # [Qt] The test fonts used for Qt tests changed to the Liberation font family,
 # due to this we are skipping tons of tests. They will be unskipped in batches ASAP.
 # https://bugs.webkit.org/show_bug.cgi?id=85203
@@ -476,129 +471,6 @@ editing/selection/14971.html
 editing/selection/vertical-rl-rtl-extend-line-backward-br.html
 editing/selection/vertical-rl-rtl-extend-line-backward-p.html
 
-# REGRESSION(r122768, r122771) made 157 fails on WebKit2
-compositing/columns/composited-in-paginated.html
-compositing/geometry/fixed-position.html
-compositing/geometry/horizontal-scroll-composited.html
-compositing/geometry/vertical-scroll-composited.html
-compositing/iframes/become-composited-nested-iframes.html
-compositing/iframes/overlapped-nested-iframes.html
-compositing/layer-creation/fixed-position-under-transform.html
-compositing/masks/masked-ancestor.html
-compositing/rtl/rtl-absolute-overflow.html
-compositing/rtl/rtl-fixed-overflow.html
-compositing/tiling/constrained-layer-size.html
-css1/box_properties/border.html
-css1/box_properties/border_left.html
-css1/box_properties/border_left_width.html
-css1/box_properties/border_right_width.html
-css1/box_properties/border_style.html
-css1/box_properties/border_top.html
-css1/box_properties/border_width.html
-css1/box_properties/clear_float.html
-css1/box_properties/float_margin.html
-css1/box_properties/float_on_text_elements.html
-css1/box_properties/margin_bottom.html
-css1/box_properties/margin_inline.html
-css1/box_properties/margin_right.html
-css1/box_properties/margin_top.html
-css1/box_properties/padding.html
-css1/box_properties/padding_bottom.html
-css1/box_properties/padding_left.html
-css1/box_properties/padding_right.html
-css1/box_properties/width.html
-css2.1/20110323/abspos-containing-block-initial-001.htm
-css2.1/20110323/abspos-containing-block-initial-007.htm
-css2.1/20110323/abspos-non-replaced-width-margin-000.htm
-css2.1/20110323/abspos-replaced-width-margin-000.htm
-css2.1/20110323/replaced-intrinsic-ratio-001.htm
-editing/deleting/delete-after-span-ws-001.html
-editing/deleting/delete-after-span-ws-002.html
-editing/deleting/delete-line-end-ws-001.html
-editing/deleting/delete-line-end-ws-002.html
-editing/input/reveal-contenteditable-on-paste-vertically.html
-editing/selection/select-all-001.html
-editing/selection/select-all-002.html
-editing/selection/select-all-003.html
-editing/selection/select-all-004.html
-fast/canvas/canvas-bg.html
-fast/canvas/fallback-content.html
-fast/css-generated-content/table-parts-before-and-after.html
-fast/dom/Element/getBoundingClientRect-getClientRects-relative-to-viewport.html
-fast/dom/Window/window-scroll-arguments.html
-fast/dom/Window/window-xy-properties.html
-fast/dom/elementFromPoint-relative-to-viewport.html
-fast/dom/scroll-element-to-rect.html
-fast/dom/zoom-scroll-page-test.html
-fast/events/change-overflow-on-overflow-change.html
-fast/events/clientXY-in-zoom-and-scroll.html
-fast/events/fire-scroll-event.html
-fast/events/input-image-scrolled-x-y.html
-fast/events/scale-and-scroll-body.html
-fast/events/scroll-after-click-on-tab-index.html
-fast/events/touch/scroll-without-mouse-lacks-mousemove-events.html
-fast/events/touch/touch-coords-in-zoom-and-scroll.html
-fast/flexbox/flex-hang.html
-fast/forms/number/number-spinbutton-in-multi-column.html
-fast/frames/frame-set-rotation-hit.html
-fast/gradients/background-clipped.html
-fast/images/gray-scale-jpeg-with-color-profile.html
-fast/images/imagemap-scroll.html
-fast/multicol/progression-reverse.html
-fast/overflow/scroll-vertical-not-horizontal.html
-fast/repaint/fixed-tranformed.html
-fast/sub-pixel/position-right-aligns-with-container.html
-fast/sub-pixel/selection/selection-gaps-at-fractional-offsets.html
-fast/sub-pixel/table-rows-have-stable-height.html
-fast/table/height-percent-test-vertical.html
-fast/table/height-percent-test.html
-fast/table/wide-colspan.html
-fast/table/wide-column.html
-fast/transforms/rotated-transform-affects-scrolling-2.html
-fast/transforms/selection-bounds-in-transformed-view.html
-printing/allowed-page-breaks.html
-printing/css2.1/page-break-after-002.html
-printing/css2.1/page-break-after-003.html
-printing/css2.1/page-break-after-004.html
-printing/page-break-always.html
-printing/page-break-avoid.html
-printing/page-break-before-avoid.html
-printing/page-break-display-none.html
-printing/zoomed-document.html
-svg/W3C-SVG-1.1-SE/coords-dom-01-f.svg
-svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg
-svg/W3C-SVG-1.1-SE/interact-pointer-03-t.svg
-svg/W3C-SVG-1.1-SE/painting-marker-07-f.svg
-svg/W3C-SVG-1.1-SE/paths-dom-02-f.svg
-svg/W3C-SVG-1.1-SE/pservers-grad-17-b.svg
-svg/W3C-SVG-1.1-SE/text-tspan-02-b.svg
-svg/W3C-SVG-1.1-SE/types-dom-03-b.svg
-svg/W3C-SVG-1.1-SE/types-dom-04-b.svg
-svg/W3C-SVG-1.1-SE/types-dom-05-b.svg
-svg/W3C-SVG-1.1/filters-turb-02-f.svg
-svg/css/path-gradient-stroke-shadow.svg
-svg/css/rect-gradient-stroke-shadow.svg
-svg/custom/glyph-selection-lang-attribute.svg
-svg/custom/gradient-stop-corner-cases.svg
-svg/custom/mask-excessive-malloc.svg
-svg/custom/massive-coordinates.svg
-svg/custom/oversized-pattern-scale.svg
-svg/custom/pan-direction.svg
-svg/custom/path-update.svg
-svg/custom/pattern-excessive-malloc.svg
-svg/custom/pointer-events-on-rounded-rect.xhtml
-svg/custom/pointer-events-with-linecaps-and-miterlimits.xhtml
-svg/custom/width-full-percentage.svg
-svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox.svg
-svg/filters/feImage-late-indirect-update.svg
-svg/filters/feMerge-wrong-input.svg
-svg/filters/filter-empty-g.svg
-svg/overflow/overflow-on-outermost-svg-element-defaults.svg
-svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-1.svg
-svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2.svg
-svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3.svg
-svg/zoom/page/absolute-sized-document-scrollbars.svg
-
 # [Qt] [WK2] editing/inserting/typing-tab-designmode tests are failing
 # https://bugs.webkit.org/show_bug.cgi?id=91988
 editing/inserting/typing-tab-designmode-forms.html
index b90dfde..3262f75 100644 (file)
@@ -1,3 +1,16 @@
+2012-07-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][WK2] REGRESSION(r119127): resetting window.internals settings between tests doesn't work properly
+        https://bugs.webkit.org/show_bug.cgi?id=88064
+
+        Reviewed by Zoltan Herczeg.
+
+        Add missing DumpRenderTreeSupportQt::resetInternalsObject(JSContextRef context) function.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::resetInternalsObject):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2012-07-26  Zeno Albisser  <zeno@webkit.org>
 
         Unreviewed Qt buildfix after r123786.
index 9ee8907..714f560 100644 (file)
@@ -1077,6 +1077,11 @@ void DumpRenderTreeSupportQt::resetInternalsObject(QWebFrame* frame)
     WebCoreTestSupport::resetInternalsObject(context);
 }
 
+void DumpRenderTreeSupportQt::resetInternalsObject(JSContextRef context)
+{
+    WebCoreTestSupport::resetInternalsObject(context);
+}
+
 QImage DumpRenderTreeSupportQt::paintPagesWithBoundaries(QWebFrame* qframe)
 {
     Frame* frame = QWebFramePrivate::core(qframe);
index 0e545d7..34041dd 100644 (file)
@@ -204,6 +204,7 @@ public:
     static void injectInternalsObject(QWebFrame*);
     static void injectInternalsObject(JSContextRef);
     static void resetInternalsObject(QWebFrame*);
+    static void resetInternalsObject(JSContextRef);
 
     static void setInteractiveFormValidationEnabled(QWebPage*, bool);
 
index fba5d54..728de8a 100644 (file)
@@ -1,3 +1,15 @@
+2012-07-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][WK2] REGRESSION(r119127): resetting window.internals settings between tests doesn't work properly
+        https://bugs.webkit.org/show_bug.cgi?id=88064
+
+        Reviewed by Zoltan Herczeg.
+
+        Use resetInternalsObject() instead of injectInternalsObject().
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::resetAfterTest):
+
 2012-07-26  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Remove forwarding headers from MiniBrowser/Efl.
index 6df605d..16371d1 100644 (file)
@@ -362,7 +362,7 @@ void InjectedBundlePage::resetAfterTest()
     WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
     JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
 #if PLATFORM(QT)
-    DumpRenderTreeSupportQt::injectInternalsObject(context);
+    DumpRenderTreeSupportQt::resetInternalsObject(context);
 #else
     WebCoreTestSupport::resetInternalsObject(context);
 #endif