Changeset 56547 in webkit


Ignore:
Timestamp:
Mar 25, 2010 8:24:28 AM (14 years ago)
Author:
tonikitoo@webkit.org
Message:

Added missing frame flattening activation on fast/frames/flattening/frameset-flattening-grid.html; removed unnecessary CONSOLE MESSAGE from the expected file; reset the setFrameSetFlatteningEnabled for each test.

Reviewed by Kenneth Christiansen.
Patch by Diego Gonzalez <​diego.gonzalez@openbossa.org>

WebKitTools:

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::resetSettings):

LayoutTests:

  • fast/frames/flattening/frameset-flattening-grid.html:
  • platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r56543 r56547  
    1515        * platform/mac-leopard/Skipped:
    1616        * platform/mac-snowleopard/Skipped:
     17
     182010-03-25  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     19
     20        Reviewed by Kenneth Christiansen.
     21
     22        Added missing frame flattening activation on
     23        fast/frames/flattening/frameset-flattening-grid.html;
     24        removed unnecessary CONSOLE MESSAGE from the expected file;
     25        reset the setFrameSetFlatteningEnabled for each test.
     26
     27        * fast/frames/flattening/frameset-flattening-grid.html:
     28        * platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt:
    1729
    18302010-03-25  Diego Gonzalez  <diego.gonzalez@openbossa.org>

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html

    r54440 r56547  
    11<html>
     2<head>
     3    <script type="text/javascript">
     4        function test()
     5        {
     6            if (window.layoutTestController) {
     7                layoutTestController.waitUntilDone();
     8                layoutTestController.setFrameSetFlatteningEnabled(true);
     9            }
     10
     11            setTimeout(function() {
     12                if (window.layoutTestController)
     13                    layoutTestController.notifyDone();
     14            }, 0);
     15        }
     16    </script>
     17</head>
    218<frameset border=0 rows="100,400" cols="300,300" onload="test()">
    319    <frame src="data:text/html,

  • trunk/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-grid-expected.txt

    r54441 r56547  
    1 CONSOLE MESSAGE: line 2: ReferenceError: Can't find variable: test
    21layer at (0,0) size 1200x800
    32  RenderView at (0,0) size 784x584

  • trunk/WebKitTools/ChangeLog

    r56545 r56547  
     12010-03-25  Diego Gonzalez  <diego.gonzalez@openbossa.org>
     2
     3        Reviewed by Kenneth Christiansen.
     4
     5        Added missing frame flattening activation on
     6        fast/frames/flattening/frameset-flattening-grid.html;
     7        removed unnecessary CONSOLE MESSAGE from the expected file;
     8        reset the setFrameSetFlatteningEnabled for each test.
     9
     10        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     11        (WebCore::WebPage::resetSettings):
     12
    1132010-03-25  Chris Jerdonek  <cjerdonek@webkit.org>
    214

  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r56328 r56547  
    190190    settings()->resetAttribute(QWebSettings::LocalContentCanAccessRemoteUrls);
    191191    m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
     192    m_drt->layoutTestController()->setFrameSetFlatteningEnabled(false);
    192193
    193194    // globalSettings must be reset explicitly.
Note: See TracChangeset for help on using the changeset viewer.