Changeset 54626 in webkit


Ignore:
Timestamp:
Feb 10, 2010 3:23:06 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-02-10 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-10 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/LayoutTestController.cpp: (setFrameSetFlatteningEnabledCallback): (LayoutTestController::staticFunctions):
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
  • DumpRenderTree/mac/LayoutTestControllerMac.mm: (LayoutTestController::setFrameSetFlatteningEnabled):
Location:
trunk
Files:
6 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r54625 r54626  
     12010-02-10  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-10  Kenneth Russell  <kbr@google.com>
    218
  • trunk/LayoutTests/platform/mac/Skipped

    r54540 r54626  
    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

    r54614 r54626  
     12010-02-10  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/LayoutTestController.cpp:
     11        (setFrameSetFlatteningEnabledCallback):
     12        (LayoutTestController::staticFunctions):
     13        * DumpRenderTree/LayoutTestController.h:
     14        * DumpRenderTree/mac/DumpRenderTree.mm:
     15        (resetDefaultsToConsistentValues):
     16        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     17        (LayoutTestController::setFrameSetFlatteningEnabled):
     18
    1192010-02-08  Jon Honeycutt  <jhoneycutt@apple.com>
    220
  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r54533 r54626  
    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

    r54533 r54626  
    9191    void setUserStyleSheetLocation(JSStringRef path);
    9292    void setXSSAuditorEnabled(bool flag);
     93    void setFrameSetFlatteningEnabled(bool enable);
    9394
    9495    void waitForPolicyDelegate();
  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r53714 r54626  
    424424    [preferences setXSSAuditorEnabled:NO];
    425425    [preferences setLoadsImagesAutomatically:YES];
     426    [preferences setFrameSetFlatteningEnabled:NO];
    426427    if (persistentUserStyleSheetLocation) {
    427428        [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];
  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r54533 r54626  
    325325}
    326326
     327void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     328{
     329    [[[mainFrame webView] preferences] setFrameSetFlatteningEnabled:enabled];
     330}
     331
    327332void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
    328333{
Note: See TracChangeset for help on using the changeset viewer.