Changeset 54719 in webkit


Ignore:
Timestamp:
Feb 12, 2010 4:55:54 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-02-12 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Support frameset flattening
​https://bugs.webkit.org/show_bug.cgi?id=32717

Add expected results of the FrameSet Flattening tests.

  • platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
  • platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
  • platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
  • platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
  • platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
  • platform/mac/Skipped:

2010-02-12 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Support frameset flattening
​https://bugs.webkit.org/show_bug.cgi?id=32717

Add FrameSet Flattening support to Mac DRT.

  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::setFrameSetFlatteningEnabled):
  • DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
  • DumpRenderTree/win/LayoutTestControllerWin.cpp: (LayoutTestController::setXSSAuditorEnabled):
  • DumpRenderTree/wx/LayoutTestControllerWx.cpp: (LayoutTestController::setFrameSetFlatteningEnabled):
  • DumpRenderTree/LayoutTestController.cpp: (setFrameSetFlatteningEnabledCallback): (LayoutTestController::staticFunctions):
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
  • DumpRenderTree/mac/LayoutTestControllerMac.mm: (LayoutTestController::setFrameSetFlatteningEnabled):
Location:
trunk
Files:
6 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r54709 r54719  
     12010-02-12  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Support frameset flattening
     6        https://bugs.webkit.org/show_bug.cgi?id=32717
     7
     8        Add expected results of the FrameSet Flattening tests.
     9
     10        * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Added.
     11        * platform/mac/fast/frames/flattening/frameset-flattening-grid-expected.txt: Added.
     12        * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Added.
     13        * platform/mac/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt: Added.
     14        * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Added.
     15        * platform/mac/Skipped:
     16
    1172010-02-12  Csaba Osztrogonác  <ossy@webkit.org>
    218

  • trunk/LayoutTests/platform/mac/Skipped

    r54628 r54719  
    113113http/tests/media/video-referer.html
    114114
    115 # Skip frame flattening tests until it can be tested by this DRT
    116 # https://bugs.webkit.org/show_bug.cgi?id=32717
    117 fast/frames/flattening/
    118 
    119115# Fails intermittently on Leopard and Tiger.
    120116# https://bugs.webkit.org/show_bug.cgi?id=29154

  • trunk/WebKitTools/ChangeLog

    r54710 r54719  
     12010-02-12  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Support frameset flattening
     6        https://bugs.webkit.org/show_bug.cgi?id=32717
     7
     8        Add FrameSet Flattening support to Mac DRT.
     9
     10        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     11        (LayoutTestController::setFrameSetFlatteningEnabled):
     12        * DumpRenderTree/win/DumpRenderTree.cpp:
     13        (resetDefaultsToConsistentValues):
     14        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     15        (LayoutTestController::setXSSAuditorEnabled):
     16        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     17        (LayoutTestController::setFrameSetFlatteningEnabled):
     18        * DumpRenderTree/LayoutTestController.cpp:
     19        (setFrameSetFlatteningEnabledCallback):
     20        (LayoutTestController::staticFunctions):
     21        * DumpRenderTree/LayoutTestController.h:
     22        * DumpRenderTree/mac/DumpRenderTree.mm:
     23        (resetDefaultsToConsistentValues):
     24        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     25        (LayoutTestController::setFrameSetFlatteningEnabled):
     26
    1272010-02-12  Dirk Pranke  <dpranke@chromium.org>
    228

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r54628 r54719  
    913913    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    914914    controller->setXSSAuditorEnabled(JSValueToBoolean(context, arguments[0]));
     915
     916    return JSValueMakeUndefined(context);
     917}
     918
     919static JSValueRef setFrameSetFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     920{
     921    // Has mac & windows implementation
     922    if (argumentCount < 1)
     923        return JSValueMakeUndefined(context);
     924
     925    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     926    controller->setFrameSetFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
    915927
    916928    return JSValueMakeUndefined(context);
    … …  
    13941406        { "setPrivateBrowsingEnabled", setPrivateBrowsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    13951407        { "setXSSAuditorEnabled", setXSSAuditorEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     1408        { "setFrameSetFlatteningEnabled", setFrameSetFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    13961409        { "setSelectTrailingWhitespaceEnabled", setSelectTrailingWhitespaceEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    13971410        { "setSmartInsertDeleteEnabled", setSmartInsertDeleteEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r54628 r54719  
    9191    void setUserStyleSheetLocation(JSStringRef path);
    9292    void setXSSAuditorEnabled(bool flag);
     93    void setFrameSetFlatteningEnabled(bool enable);
    9394
    9495    void waitForPolicyDelegate();

  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r54533 r54719  
    335335}
    336336
     337void LayoutTestController::setFrameSetFlatteningEnabled(bool flag)
     338{
     339    // FIXME: implement
     340}
     341
    337342void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool flag)
    338343{

  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r54704 r54719  
    423423    [preferences setDeveloperExtrasEnabled:NO];
    424424    [preferences setLoadsImagesAutomatically:YES];
     425    [preferences setFrameSetFlatteningEnabled:NO];
    425426    if (persistentUserStyleSheetLocation) {
    426427        [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];

  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r54628 r54719  
    325325}
    326326
     327void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     328{
     329    [[[mainFrame webView] preferences] setFrameSetFlatteningEnabled:enabled];
     330}
     331
    327332void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
    328333{

  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r51664 r54719  
    793793        prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
    794794        prefsPrivate->setXSSAuditorEnabled(FALSE);
     795        prefsPrivate->setFrameSetFlatteningEnabled(FALSE);
    795796        prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
    796797    }

  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r54533 r54719  
    373373}
    374374
     375void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     376{
     377    COMPtr<IWebView> webView;
     378    if (FAILED(frame->webView(&webView)))
     379        return;
     380
     381    COMPtr<IWebPreferences> preferences;
     382    if (FAILED(webView->preferences(&preferences)))
     383        return;
     384
     385    COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
     386    if (!prefsPrivate)
     387        return;
     388
     389    prefsPrivate->setFrameSetFlatteningEnabled(enabled);
     390}
     391
    375392void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
    376393{

  • trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r54631 r54719  
    171171}
    172172
     173void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     174{
     175    // FIXME: implement
     176}
     177
    173178void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
    174179{
Note: See TracChangeset for help on using the changeset viewer.