Changeset 56718 in webkit


Ignore:
Timestamp:
Mar 29, 2010 7:03:06 AM (14 years ago)
Author:
kenneth@webkit.org
Message:

WebCore: Implement flattening for iframes.

Reviewed by Antti Koivisto.

Refactoring of frameset flattening code to reuse it for
iframe flattening.

Tests: fast/frames/flattening/iframe-flattening-simple.html

  • WebCore.base.exp:
  • page/FrameView.cpp:

(WebCore::FrameView::layout):
(WebCore::FrameView::scheduleRelayout):

  • page/Settings.cpp:

(WebCore::Settings::Settings):
(WebCore::Settings::setFrameFlatteningEnabled):

  • page/Settings.h:

(WebCore::Settings::frameFlatteningEnabled):

  • rendering/RenderFrame.cpp:
  • rendering/RenderFrame.h:
  • rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::flattenFrameSet):

  • rendering/RenderFrameSet.h:
  • rendering/RenderPart.cpp:

(WebCore::RenderPart::layoutWithFlattening):

  • rendering/RenderPart.h:
  • rendering/RenderPartObject.cpp:

(WebCore::RenderPartObject::flattenFrame):
(WebCore::RenderPartObject::calcHeight):
(WebCore::RenderPartObject::calcWidth):
(WebCore::RenderPartObject::layout):

  • rendering/RenderPartObject.h:

WebKit/mac: Change method name due to it dealing with both flattening
of frame sets and inner frames.

Reviewed by Antti Koivisto.

  • WebView/WebPreferenceKeysPrivate.h:
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences isFrameFlatteningEnabled]):
(-[WebPreferences setFrameFlatteningEnabled:]):

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(-[WebView _preferencesChangedNotification:]):

WebKit/qt: Change due to renaming of frame flattening setting.

Reviewed by Antti Koivisto.

  • Api/qwebpage.cpp:

(qt_drt_setFrameFlatteningEnabled):

  • Api/qwebsettings.cpp:

(QWebSettingsPrivate::apply):

  • symbian/eabi/QtWebKitu.def:

WebKit/win: Change method name due to it dealing with both flattening
of frame sets and inner frames.

Reviewed by Antti Koivisto.

  • Interfaces/IWebPreferencesPrivate.idl:
  • WebPreferenceKeysPrivate.h:
  • WebPreferences.cpp:

(WebPreferences::initializeDefaultSettings):
(WebPreferences::isFrameFlatteningEnabled):
(WebPreferences::setFrameFlatteningEnabled):

  • WebPreferences.h:
  • WebView.cpp:

(WebView::notifyPreferencesChanged):

WebKitTools: Renaming of frame flattening LayoutTestController method
to setFrameFlatteningEnabled(bool)

Reviewed by Antti Koivisto.

  • DumpRenderTree/LayoutTestController.cpp:

(setFrameFlatteningEnabledCallback):
(LayoutTestController::staticFunctions):

  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:

(LayoutTestController::setFrameFlatteningEnabled):

  • DumpRenderTree/mac/DumpRenderTree.mm:

(resetDefaultsToConsistentValues):

  • DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::setFrameFlatteningEnabled):

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::resetSettings):

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::setFrameFlatteningEnabled):

  • DumpRenderTree/qt/LayoutTestControllerQt.h:
  • DumpRenderTree/win/DumpRenderTree.cpp:

(resetDefaultsToConsistentValues):

  • DumpRenderTree/win/LayoutTestControllerWin.cpp:

(LayoutTestController::setFrameFlatteningEnabled):

  • DumpRenderTree/wx/LayoutTestControllerWx.cpp:

(LayoutTestController::setFrameFlatteningEnabled):

LayoutTests: Add new iframe flattening test and change existing frameset
flattening tests to use the new LayoutTestController method.

Reviewed by Antti Koivisto.

  • fast/frames/flattening/frameset-flattening-advanced.html:
  • fast/frames/flattening/frameset-flattening-grid.html:
  • fast/frames/flattening/frameset-flattening-simple.html:
  • fast/frames/flattening/frameset-flattening-subframe-resize.html:
  • fast/frames/flattening/frameset-flattening-subframesets.html:
  • fast/frames/flattening/iframe-flattening-simple.html: Added.
  • platform/qt/fast/frames/flattening/iframe-flattening-simple-expected.txt: Added.
Location:
trunk
Files:
2 added
47 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r56717 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>, Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Add new iframe flattening test and change existing frameset
     6        flattening tests to use the new LayoutTestController method.
     7
     8       * fast/frames/flattening/frameset-flattening-advanced.html:
     9        * fast/frames/flattening/frameset-flattening-grid.html:
     10        * fast/frames/flattening/frameset-flattening-simple.html:
     11        * fast/frames/flattening/frameset-flattening-subframe-resize.html:
     12        * fast/frames/flattening/frameset-flattening-subframesets.html:
     13        * fast/frames/flattening/iframe-flattening-simple.html: Added.
     14        * platform/qt/fast/frames/flattening/iframe-flattening-simple-expected.txt: Added.
     15        * platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt:
     16        * platform/qt/fast/frames/flattening/iframe-flattening-simple-expected.txt:
     17
    1182010-03-29  Csaba Osztrogonác  <ossy@webkit.org>
    219
  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html

    r54440 r56718  
    77            if (window.layoutTestController) {
    88                layoutTestController.waitUntilDone();
    9                 layoutTestController.setFrameSetFlatteningEnabled(true);
     9                layoutTestController.setFrameFlatteningEnabled(true);
    1010            }
    1111
  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html

    r56547 r56718  
    66            if (window.layoutTestController) {
    77                layoutTestController.waitUntilDone();
    8                 layoutTestController.setFrameSetFlatteningEnabled(true);
     8                layoutTestController.setFrameFlatteningEnabled(true);
    99            }
    1010
  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html

    r54440 r56718  
    66            if (window.layoutTestController) {
    77                layoutTestController.waitUntilDone();
    8                 layoutTestController.setFrameSetFlatteningEnabled(true);
     8                layoutTestController.setFrameFlatteningEnabled(true);
    99            }
    1010
  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html

    r54440 r56718  
    77            if (window.layoutTestController) {
    88                layoutTestController.waitUntilDone();
    9                 layoutTestController.setFrameSetFlatteningEnabled(true);
     9                layoutTestController.setFrameFlatteningEnabled(true);
    1010            }
    1111        }
  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html

    r54440 r56718  
    77            if (window.layoutTestController) {
    88                layoutTestController.waitUntilDone();
    9                 layoutTestController.setFrameSetFlatteningEnabled(true);
     9                layoutTestController.setFrameFlatteningEnabled(true);
    1010            }
    1111
  • trunk/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt

    r54441 r56718  
    66      RenderFrame {FRAME} at (0,0) size 300x650
    77        layer at (0,0) size 300x650
    8           RenderView at (0,0) size 300x650
    9         layer at (0,0) size 300x650
    10           RenderBlock {HTML} at (0,0) size 300x650
    11             RenderBody {BODY} at (8,8) size 284x626 [bgcolor=#008000]
    12               RenderBlock {P} at (0,0) size 284x40
     8          RenderView at (0,0) size 284x634
     9        layer at (0,0) size 284x634
     10          RenderBlock {HTML} at (0,0) size 284x634
     11            RenderBody {BODY} at (8,8) size 268x610 [bgcolor=#008000]
     12              RenderBlock {P} at (0,0) size 268x40
    1313                RenderText {#text} at (0,0) size 260x40
    1414                  text run at (0,0) width 223: "Test for frameset flattening. The"
    1515                  text run at (0,20) width 260: "flattening only works inside the DRT."
    16               RenderBlock {P} at (0,56) size 284x40
     16              RenderBlock {P} at (0,56) size 268x40
    1717                RenderText {#text} at (0,0) size 266x40
    1818                  text run at (0,0) width 266: "This frame should be 300px wide and"
  • trunk/WebCore/ChangeLog

    r56716 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Implement flattening for iframes.
     6
     7        Refactoring of frameset flattening code to reuse it for
     8        iframe flattening.
     9
     10        Tests: fast/frames/flattening/iframe-flattening-simple.html
     11
     12        * WebCore.base.exp:
     13        * page/FrameView.cpp:
     14        (WebCore::FrameView::layout):
     15        (WebCore::FrameView::scheduleRelayout):
     16        * page/Settings.cpp:
     17        (WebCore::Settings::Settings):
     18        (WebCore::Settings::setFrameFlatteningEnabled):
     19        * page/Settings.h:
     20        (WebCore::Settings::frameFlatteningEnabled):
     21        * rendering/RenderFrame.cpp:
     22        * rendering/RenderFrame.h:
     23        * rendering/RenderFrameSet.cpp:
     24        (WebCore::RenderFrameSet::flattenFrameSet):
     25        * rendering/RenderFrameSet.h:
     26        * rendering/RenderPart.cpp:
     27        (WebCore::RenderPart::layoutWithFlattening):
     28        * rendering/RenderPart.h:
     29        * rendering/RenderPartObject.cpp:
     30        (WebCore::RenderPartObject::flattenFrame):
     31        (WebCore::RenderPartObject::calcHeight):
     32        (WebCore::RenderPartObject::calcWidth):
     33        (WebCore::RenderPartObject::layout):
     34        * rendering/RenderPartObject.h:
     35
    1362010-03-29  Andrei Popescu  <andreip@google.com>
    237
  • trunk/WebCore/WebCore.base.exp

    r56479 r56718  
    688688__ZN7WebCore8Settings27setLocalStorageDatabasePathERKNS_6StringE
    689689__ZN7WebCore8Settings28setForceFTPDirectoryListingsEb
    690 __ZN7WebCore8Settings28setFrameSetFlatteningEnabledEb
     690__ZN7WebCore8Settings25setFrameFlatteningEnabledEb
    691691__ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb
    692692__ZN7WebCore8Settings29setWebArchiveDebugModeEnabledEb
  • trunk/WebCore/page/FrameView.cpp

    r56646 r56718  
    619619        Node* body = document->body();
    620620        if (body && body->renderer()) {
    621             if (body->hasTagName(framesetTag) && !m_frame->settings()->frameSetFlatteningEnabled()) {
     621            if (body->hasTagName(framesetTag) && !m_frame->settings()->frameFlatteningEnabled()) {
    622622                body->renderer()->setChildNeedsLayout(true);
    623623                vMode = ScrollbarAlwaysOff;
     
    12571257    // When frameset flattening is enabled, the contents of the frame affects layout of the parent frames.
    12581258    // Also invalidate parent frame starting from the owner element of this frame.
    1259     if (m_frame->settings()->frameSetFlatteningEnabled() && m_frame->ownerRenderer())
     1259    if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer() && m_frame->ownerElement()->hasTagName(frameTag))
    12601260        m_frame->ownerRenderer()->setNeedsLayout(true, true);
    12611261
  • trunk/WebCore/page/Settings.cpp

    r55976 r56718  
    9999    , m_needsSiteSpecificQuirks(false)
    100100    , m_fontRenderingMode(0)
    101     , m_frameSetFlatteningEnabled(false)
     101    , m_frameFlatteningEnabled(false)
    102102    , m_webArchiveDebugModeEnabled(false)
    103103    , m_localFileContentSniffingEnabled(false)
     
    439439}
    440440
    441 void Settings::setFrameSetFlatteningEnabled(bool frameSetFlatteningEnabled)
    442 {
    443     m_frameSetFlatteningEnabled = frameSetFlatteningEnabled;
     441void Settings::setFrameFlatteningEnabled(bool frameFlatteningEnabled)
     442{
     443    m_frameFlatteningEnabled = frameFlatteningEnabled;
    444444}
    445445
  • trunk/WebCore/page/Settings.h

    r56046 r56718  
    209209        bool developerExtrasEnabled() const { return m_developerExtrasEnabled; }
    210210
    211         void setFrameSetFlatteningEnabled(bool);
    212         bool frameSetFlatteningEnabled() const { return m_frameSetFlatteningEnabled; }
     211        void setFrameFlatteningEnabled(bool);
     212        bool frameFlatteningEnabled() const { return m_frameFlatteningEnabled; }
    213213
    214214        void setAuthorAndUserStylesEnabled(bool);
     
    350350        bool m_needsSiteSpecificQuirks : 1;
    351351        unsigned m_fontRenderingMode : 1;
    352         bool m_frameSetFlatteningEnabled : 1;
     352        bool m_frameFlatteningEnabled : 1;
    353353        bool m_webArchiveDebugModeEnabled : 1;
    354354        bool m_localFileContentSniffingEnabled : 1;
  • trunk/WebCore/rendering/RenderFrame.cpp

    r54440 r56718  
    6060}
    6161
    62 void RenderFrame::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
    63 {
    64     // NOTE: The width and height have been set at this point by
    65     // RenderFrameSet::positionFramesWithFlattening()
    66 
    67     FrameView* childFrameView = static_cast<FrameView*>(widget());
    68     RenderView* childRoot = childFrameView ? static_cast<RenderView*>(childFrameView->frame()->contentRenderer()) : 0;
    69     HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node());
    70 
    71     // Do not expand framesets which has zero width or height
    72     if (!width() || !height() || !childRoot) {
    73         updateWidgetPosition();
    74         if (childFrameView)
    75             childFrameView->layout();
    76         setNeedsLayout(false);
    77         return;
    78     }
    79 
    80     // need to update to calculate min/max correctly
    81     updateWidgetPosition();
    82     if (childRoot->prefWidthsDirty())
    83         childRoot->calcPrefWidths();
    84 
    85     // if scrollbars are off, and the width or height are fixed
    86     // we obey them and do not expand. With frame flattening
    87     // no subframe much ever become scrollable.
    88 
    89     bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
    90 
    91     // make sure minimum preferred width is enforced
    92     if (isScrollable || !fixedWidth || childRoot->isFrameSet())
    93         setWidth(max(width(), childRoot->minPrefWidth()));
    94 
    95     // update again to pass the width to the child frame
    96     updateWidgetPosition();
    97     childFrameView->layout();
    98 
    99     // expand the frame by setting frame height = content height
    100     if (isScrollable || !fixedHeight || childRoot->isFrameSet())
    101         setHeight(max(height(), childFrameView->contentsHeight()));
    102     if (isScrollable || !fixedWidth || childRoot->isFrameSet())
    103         setWidth(max(width(), childFrameView->contentsWidth()));
    104 
    105     updateWidgetPosition();
    106 
    107     ASSERT(!childFrameView->layoutPending());
    108     ASSERT(!childRoot->needsLayout());
    109     ASSERT(!childRoot->firstChild() || !childRoot->firstChild()->firstChild() || !childRoot->firstChild()->firstChild()->needsLayout());
    110 
    111     setNeedsLayout(false);
    112 }
    113 
    11462} // namespace WebCore
  • trunk/WebCore/rendering/RenderFrame.h

    r54440 r56718  
    3636
    3737    FrameEdgeInfo edgeInfo() const;
    38     void layoutWithFlattening(bool fixedWidth, bool fixedHeight);
    3938
    4039private:
  • trunk/WebCore/rendering/RenderFrameSet.cpp

    r54440 r56718  
    647647bool RenderFrameSet::flattenFrameSet() const
    648648{
    649     return document()->frame() && document()->frame()->settings()->frameSetFlatteningEnabled();
     649    return document()->frame() && document()->frame()->settings()->frameFlatteningEnabled();
    650650}
    651651
  • trunk/WebCore/rendering/RenderFrameSet.h

    r54440 r56718  
    7171    bool canResizeColumn(const IntPoint&) const;
    7272
    73     bool flattenFrameSet() const;
    74 
    7573private:
    7674    static const int noSplit = -1;
     
    9896    virtual void paint(PaintInfo&, int tx, int ty);
    9997    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
    100    
     98
    10199    inline HTMLFrameSetElement* frameSet() const;
     100
     101    bool flattenFrameSet() const;
    102102
    103103    void setIsResizing(bool);
  • trunk/WebCore/rendering/RenderPart.cpp

    r52947 r56718  
    2525#include "RenderPart.h"
    2626
     27#include "RenderView.h"
    2728#include "Frame.h"
    2829#include "FrameView.h"
     30#include "HTMLFrameElement.h"
    2931
    3032namespace WebCore {
     
    5557}
    5658
     59void RenderPart::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
     60{
     61    FrameView* childFrameView = static_cast<FrameView*>(widget());
     62    RenderView* childRoot = childFrameView ? static_cast<RenderView*>(childFrameView->frame()->contentRenderer()) : 0;
     63    HTMLFrameElement* element = static_cast<HTMLFrameElement*>(node());
     64
     65    // suppress scrollbars as we might have fixed width or height
     66    childFrameView->setScrollbarsSuppressed(true, true);
     67
     68    // Do not expand frames which has zero width or height
     69    if (!width() || !height() || !childRoot) {
     70        updateWidgetPosition();
     71        if (childFrameView)
     72            childFrameView->layout();
     73        setNeedsLayout(false);
     74        return;
     75    }
     76
     77    // need to update to calculate min/max correctly
     78    updateWidgetPosition();
     79    if (childRoot->prefWidthsDirty())
     80        childRoot->calcPrefWidths();
     81
     82    // if scrollbars are off, and the width or height are fixed
     83    // we obey them and do not expand. With frame flattening
     84    // no subframe much ever become scrollable.
     85
     86    bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
     87
     88    // make sure minimum preferred width is enforced
     89    if (isScrollable || !fixedWidth)
     90        setWidth(max(width(), childRoot->minPrefWidth()));
     91
     92    // update again to pass the width to the child frame
     93    updateWidgetPosition();
     94    childFrameView->layout();
     95
     96    // expand the frame by setting frame height = content height
     97    if (isScrollable || !fixedHeight || childRoot->isFrameSet())
     98        setHeight(max(height(), childFrameView->contentsHeight()));
     99    if (isScrollable || !fixedWidth || childRoot->isFrameSet())
     100        setWidth(max(width(), childFrameView->contentsWidth()));
     101
     102    // make room for the inset border
     103    setWidth(width() + borderLeft() + borderRight());
     104    setHeight(height() + borderTop() + borderBottom());
     105
     106    updateWidgetPosition();
     107
     108    ASSERT(!childFrameView->layoutPending());
     109    ASSERT(!childRoot->needsLayout());
     110    ASSERT(!childRoot->firstChild() || !childRoot->firstChild()->firstChild() || !childRoot->firstChild()->firstChild()->needsLayout());
     111
     112    setNeedsLayout(false);
     113}
     114
     115
    57116void RenderPart::viewCleared()
    58117{
  • trunk/WebCore/rendering/RenderPart.h

    r52947 r56718  
    3636    RenderPart(Element*);
    3737    virtual ~RenderPart();
    38    
     38
    3939    bool hasFallbackContent() const { return m_hasFallbackContent; }
    4040
    4141    virtual void setWidget(PassRefPtr<Widget>);
    4242    virtual void viewCleared();
     43
     44    void layoutWithFlattening(bool fixedWidth, bool fixedHeight);
    4345
    4446protected:
  • trunk/WebCore/rendering/RenderPartObject.cpp

    r52947 r56718  
    3636#include "RenderView.h"
    3737#include "RenderWidgetProtector.h"
     38#include "Settings.h"
    3839#include "Text.h"
    3940
     
    5152}
    5253
     54bool RenderPartObject::flattenFrame() const
     55{
     56    if (!node() || !node()->hasTagName(iframeTag))
     57        return false;
     58
     59    HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
     60    if (element->scrollingMode() == ScrollbarAlwaysOff
     61        || style()->width().isFixed()
     62        || style()->height().isFixed())
     63        return false;
     64
     65    Document* document = element ? element->document() : 0;
     66    return document->frame() && document->frame()->settings()->frameFlatteningEnabled();
     67}
     68
     69void RenderPartObject::calcHeight()
     70{
     71    RenderPart::calcHeight();
     72    if (flattenFrame())
     73        setHeight(max(height(), static_cast<FrameView*>(widget())->contentsHeight()));
     74}
     75
     76void RenderPartObject::calcWidth()
     77{
     78    RenderPart::calcWidth();
     79    if (flattenFrame())
     80        setWidth(max(width(), static_cast<FrameView*>(widget())->contentsWidth()));
     81}
     82
    5383void RenderPartObject::layout()
    5484{
     
    5787    calcWidth();
    5888    calcHeight();
     89
     90    if (flattenFrame()) {
     91        layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
     92        return;
     93    }
    5994
    6095    RenderPart::layout();
  • trunk/WebCore/rendering/RenderPartObject.h

    r52947 r56718  
    3333    RenderPartObject(Element*);
    3434
     35    virtual void calcHeight();
     36    virtual void calcWidth();
     37
    3538private:
    3639    virtual const char* renderName() const { return "RenderPartObject"; }
     
    3942
    4043    virtual void viewCleared();
     44
     45    bool flattenFrame() const;
    4146};
    4247
  • trunk/WebKit/mac/ChangeLog

    r56667 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Change method name due to it dealing with both flattening
     6        of frame sets and inner frames.
     7
     8        * WebView/WebPreferenceKeysPrivate.h:
     9        * WebView/WebPreferences.mm:
     10        (+[WebPreferences initialize]):
     11        (-[WebPreferences isFrameFlatteningEnabled]):
     12        (-[WebPreferences setFrameFlatteningEnabled:]):
     13        * WebView/WebPreferencesPrivate.h:
     14        * WebView/WebView.mm:
     15        (-[WebView _preferencesChangedNotification:]):
     16
    1172010-03-27  Darin Adler  <darin@apple.com>
    218
  • trunk/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r54873 r56718  
    9292#define WebKitUsesProxiedOpenPanelPreferenceKey @"WebKitUsesProxiedOpenPanel"
    9393#define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime"
    94 #define WebKitFrameSetFlatteningEnabledPreferenceKey @"WebKitFrameSetFlatteningEnabled"
     94#define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
    9595
    9696// These are private both because callers should be using the cover methods and because the
  • trunk/WebKit/mac/WebView/WebPreferences.mm

    r54873 r56718  
    358358        [NSNumber numberWithBool:NO],   WebKitUsesProxiedOpenPanelPreferenceKey,
    359359        [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
    360         [NSNumber numberWithBool:NO],   WebKitFrameSetFlatteningEnabledPreferenceKey,
     360        [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
    361361        nil];
    362362
     
    12171217}
    12181218
    1219 - (BOOL)isFrameSetFlatteningEnabled
    1220 {
    1221     return [self _boolValueForKey:WebKitFrameSetFlatteningEnabledPreferenceKey];
    1222 }
    1223 
    1224 - (void)setFrameSetFlatteningEnabled:(BOOL)flag
    1225 {
    1226     [self _setBoolValue:flag forKey:WebKitFrameSetFlatteningEnabledPreferenceKey];
     1219- (BOOL)isFrameFlatteningEnabled
     1220{
     1221    return [self _boolValueForKey:WebKitFrameFlatteningEnabledPreferenceKey];
     1222}
     1223
     1224- (void)setFrameFlatteningEnabled:(BOOL)flag
     1225{
     1226    [self _setBoolValue:flag forKey:WebKitFrameFlatteningEnabledPreferenceKey];
    12271227}
    12281228
  • trunk/WebKit/mac/WebView/WebPreferencesPrivate.h

    r54873 r56718  
    117117- (void)setPluginAllowedRunTime:(unsigned)allowedRunTime;
    118118
    119 - (BOOL)isFrameSetFlatteningEnabled;
    120 - (void)setFrameSetFlatteningEnabled:(BOOL)flag;
     119- (BOOL)isFrameFlatteningEnabled;
     120- (void)setFrameFlatteningEnabled:(BOOL)flag;
    121121
    122122// zero means do AutoScale
  • trunk/WebKit/mac/WebView/WebView.mm

    r55701 r56718  
    13521352    settings->setWebGLEnabled([preferences webGLEnabled]);
    13531353    settings->setLoadDeferringEnabled(shouldEnableLoadDeferring());
    1354     settings->setFrameSetFlatteningEnabled([preferences isFrameSetFlatteningEnabled]);
     1354    settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
    13551355}
    13561356
  • trunk/WebKit/qt/Api/qwebpage.cpp

    r56552 r56718  
    147147}
    148148
    149 void QWEBKIT_EXPORT qt_drt_setFrameSetFlatteningEnabled(QWebPage* page, bool enabled)
    150 {
    151     QWebPagePrivate::core(page)->settings()->setFrameSetFlatteningEnabled(enabled);
     149void QWEBKIT_EXPORT qt_drt_setFrameFlatteningEnabled(QWebPage* page, bool enabled)
     150{
     151    QWebPagePrivate::core(page)->settings()->setFrameFlatteningEnabled(enabled);
    152152}
    153153
  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r56537 r56718  
    198198        value = attributes.value(QWebSettings::FrameFlatteningEnabled,
    199199                                      global->attributes.value(QWebSettings::FrameFlatteningEnabled));
    200         settings->setFrameSetFlatteningEnabled(value);
     200        settings->setFrameFlatteningEnabled(value);
    201201
    202202        QUrl location = !userStyleSheetLocation.isEmpty() ? userStyleSheetLocation : global->userStyleSheetLocation;
     
    242242                                      global->attributes.value(QWebSettings::XSSAuditingEnabled));
    243243        settings->setXSSAuditorEnabled(value);
    244        
     244
    245245#if ENABLE(TILED_BACKING_STORE)
    246246        value = attributes.value(QWebSettings::TiledBackingStoreEnabled,
  • trunk/WebKit/qt/ChangeLog

    r56705 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Change due to renaming of frame flattening setting.
     6
     7        * Api/qwebpage.cpp:
     8        (qt_drt_setFrameFlatteningEnabled):
     9        * Api/qwebsettings.cpp:
     10        (QWebSettingsPrivate::apply):
     11        * symbian/eabi/QtWebKitu.def:
     12
    1132010-03-28  Alexey Proskuryakov  <ap@apple.com>
    214
  • trunk/WebKit/qt/symbian/eabi/QtWebKitu.def

    r56611 r56718  
    708708        _Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME
    709709        _Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME
    710         _Z35qt_drt_setFrameSetFlatteningEnabledP8QWebPageb @ 709 NONAME
     710        _Z35qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME
    711711        _Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME
    712712        _Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME
  • trunk/WebKit/win/ChangeLog

    r56507 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Change method name due to it dealing with both flattening
     6        of frame sets and inner frames.
     7
     8        * Interfaces/IWebPreferencesPrivate.idl:
     9        * WebPreferenceKeysPrivate.h:
     10        * WebPreferences.cpp:
     11        (WebPreferences::initializeDefaultSettings):
     12        (WebPreferences::isFrameFlatteningEnabled):
     13        (WebPreferences::setFrameFlatteningEnabled):
     14        * WebPreferences.h:
     15        * WebView.cpp:
     16        (WebView::notifyPreferencesChanged):
     17
    1182010-03-24  Jon Honeycutt  <jhoneycutt@apple.com>
    219
  • trunk/WebKit/win/Interfaces/IWebPreferencesPrivate.idl

    r56118 r56718  
    8080    HRESULT setXSSAuditorEnabled([in] BOOL enabled);
    8181
    82     HRESULT isFrameSetFlatteningEnabled([out, retval] BOOL *enabled);
    83     HRESULT setFrameSetFlatteningEnabled([in] BOOL enabled);
     82    HRESULT isFrameFlatteningEnabled([out, retval] BOOL *enabled);
     83    HRESULT setFrameFlatteningEnabled([in] BOOL enabled);
    8484
    8585    HRESULT experimentalNotificationsEnabled([out, retval] BOOL *enabled);
  • trunk/WebKit/win/WebPreferenceKeysPrivate.h

    r56118 r56718  
    132132#define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime"
    133133
    134 #define WebKitFrameSetFlatteningEnabledPreferenceKey "WebKitFrameSetFlatteningEnabled"
     134#define WebKitFrameFlatteningEnabledPreferenceKey "WebKitFrameFlatteningEnabled"
    135135
    136136#define WebKitAcceleratedCompositingEnabledPreferenceKey "WebKitAcceleratedCompositingEnabled"
  • trunk/WebKit/win/WebPreferences.cpp

    r56118 r56718  
    208208    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowFileAccessFromFileURLsPreferenceKey), kCFBooleanTrue);
    209209    CFDictionaryAddValue(defaults, CFSTR(WebKitXSSAuditorEnabledPreferenceKey), kCFBooleanTrue);
    210     CFDictionaryAddValue(defaults, CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey), kCFBooleanFalse);
     210    CFDictionaryAddValue(defaults, CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), kCFBooleanFalse);
    211211    CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue);
    212212    CFDictionaryAddValue(defaults, CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue);
     
    824824}
    825825
    826 HRESULT STDMETHODCALLTYPE WebPreferences::isFrameSetFlatteningEnabled(
    827     /* [retval][out] */ BOOL* enabled)
    828 {
    829     *enabled = boolValueForKey(CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey));
    830     return S_OK;
    831 }
    832 
    833 HRESULT STDMETHODCALLTYPE WebPreferences::setFrameSetFlatteningEnabled(
    834     /* [in] */ BOOL enabled)
    835 {
    836     setBoolValue(CFSTR(WebKitFrameSetFlatteningEnabledPreferenceKey), enabled);
     826HRESULT STDMETHODCALLTYPE WebPreferences::isFrameFlatteningEnabled(
     827    /* [retval][out] */ BOOL* enabled)
     828{
     829    *enabled = boolValueForKey(CFSTR(WebKitFrameFlatteningEnabledPreferenceKey));
     830    return S_OK;
     831}
     832
     833HRESULT STDMETHODCALLTYPE WebPreferences::setFrameFlatteningEnabled(
     834    /* [in] */ BOOL enabled)
     835{
     836    setBoolValue(CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), enabled);
    837837    return S_OK;
    838838}
  • trunk/WebKit/win/WebPreferences.h

    r56118 r56718  
    387387    /* [retval][out] */ UINT* allowedRunTime);
    388388
    389     virtual HRESULT STDMETHODCALLTYPE isFrameSetFlatteningEnabled(
     389    virtual HRESULT STDMETHODCALLTYPE isFrameFlatteningEnabled(
    390390    /* [retval][out] */ BOOL* enabled);
    391391
    392     virtual HRESULT STDMETHODCALLTYPE setFrameSetFlatteningEnabled(
     392    virtual HRESULT STDMETHODCALLTYPE setFrameFlatteningEnabled(
    393393    /* [in] */ BOOL enabled);
    394394
  • trunk/WebKit/win/WebView.cpp

    r56118 r56718  
    46784678    settings->setPluginAllowedRunTime(runTime);
    46794679
    4680     hr = prefsPrivate->isFrameSetFlatteningEnabled(&enabled);
     4680    hr = prefsPrivate->isFrameFlatteningEnabled(&enabled);
    46814681    if (FAILED(hr))
    46824682        return hr;
    4683     settings->setFrameSetFlatteningEnabled(enabled);
     4683    settings->setFrameFlatteningEnabled(enabled);
    46844684
    46854685#if USE(ACCELERATED_COMPOSITING)
  • trunk/WebKitTools/ChangeLog

    r56701 r56718  
     12010-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Antti Koivisto.
     4
     5        Renaming of frame flattening LayoutTestController method
     6        to setFrameFlatteningEnabled(bool)
     7
     8        * DumpRenderTree/LayoutTestController.cpp:
     9        (setFrameFlatteningEnabledCallback):
     10        (LayoutTestController::staticFunctions):
     11        * DumpRenderTree/LayoutTestController.h:
     12        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     13        (LayoutTestController::setFrameFlatteningEnabled):
     14        * DumpRenderTree/mac/DumpRenderTree.mm:
     15        (resetDefaultsToConsistentValues):
     16        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     17        (LayoutTestController::setFrameFlatteningEnabled):
     18        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     19        (WebCore::WebPage::resetSettings):
     20        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     21        (LayoutTestController::setFrameFlatteningEnabled):
     22        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     23        * DumpRenderTree/win/DumpRenderTree.cpp:
     24        (resetDefaultsToConsistentValues):
     25        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     26        (LayoutTestController::setFrameFlatteningEnabled):
     27        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     28        (LayoutTestController::setFrameFlatteningEnabled):
     29
    1302010-03-28  Gustavo Noronha Silva  <gns@gnome.org>
    231
  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r56606 r56718  
    935935
    936936
    937 static JSValueRef setFrameSetFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    938 {
    939     // Has mac & windows implementation
    940     if (argumentCount < 1)
    941         return JSValueMakeUndefined(context);
    942 
    943     LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    944     controller->setFrameSetFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
     937static JSValueRef setFrameFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     938{
     939    // Has mac & windows implementation
     940    if (argumentCount < 1)
     941        return JSValueMakeUndefined(context);
     942
     943    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     944    controller->setFrameFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
    945945
    946946    return JSValueMakeUndefined(context);
     
    14831483        { "setXSSAuditorEnabled", setXSSAuditorEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    14841484        { "setSpatialNavigationEnabled", setSpatialNavigationEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    1485         { "setFrameSetFlatteningEnabled", setFrameSetFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     1485        { "setFrameFlatteningEnabled", setFrameFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    14861486        { "setSelectTrailingWhitespaceEnabled", setSelectTrailingWhitespaceEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    14871487        { "setSmartInsertDeleteEnabled", setSmartInsertDeleteEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r56606 r56718  
    9494    void setUserStyleSheetLocation(JSStringRef path);
    9595    void setXSSAuditorEnabled(bool flag);
    96     void setFrameSetFlatteningEnabled(bool enable);
     96    void setFrameFlatteningEnabled(bool enable);
    9797    void setSpatialNavigationEnabled(bool enable);
    9898
  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r56661 r56718  
    348348}
    349349
    350 void LayoutTestController::setFrameSetFlatteningEnabled(bool flag)
     350void LayoutTestController::setFrameFlatteningEnabled(bool flag)
    351351{
    352352    // FIXME: implement
  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r56597 r56718  
    428428    [preferences setDeveloperExtrasEnabled:NO];
    429429    [preferences setLoadsImagesAutomatically:YES];
    430     [preferences setFrameSetFlatteningEnabled:NO];
     430    [preferences setFrameFlatteningEnabled:NO];
    431431    if (persistentUserStyleSheetLocation) {
    432432        [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];
  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r56606 r56718  
    330330}
    331331
    332 void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
    333 {
    334     [[[mainFrame webView] preferences] setFrameSetFlatteningEnabled:enabled];
     332void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
     333{
     334    [[[mainFrame webView] preferences] setFrameFlatteningEnabled:enabled];
    335335}
    336336
  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r56661 r56718  
    192192
    193193    m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
    194     m_drt->layoutTestController()->setFrameSetFlatteningEnabled(false);
     194    m_drt->layoutTestController()->setFrameFlatteningEnabled(false);
    195195
    196196    // globalSettings must be reset explicitly.
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r56661 r56718  
    4141extern void qt_dump_resource_load_callbacks(bool b);
    4242extern void qt_drt_setMediaType(QWebFrame* qframe, const QString& type);
    43 extern void qt_drt_setFrameSetFlatteningEnabled(QWebPage*, bool);
     43extern void qt_drt_setFrameFlatteningEnabled(QWebPage*, bool);
    4444extern void qt_drt_setJavaScriptProfilingEnabled(QWebFrame*, bool enabled);
    4545extern void qt_drt_setTimelineProfilingEnabled(QWebPage*, bool enabled);
     
    318318}
    319319
    320 void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
    321 {
    322     qt_drt_setFrameSetFlatteningEnabled(m_drt->webPage(), enabled);
     320void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
     321{
     322    qt_drt_setFrameFlatteningEnabled(m_drt->webPage(), enabled);
    323323}
    324324
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r56606 r56718  
    124124
    125125    void setMediaType(const QString& type);
    126     void setFrameSetFlatteningEnabled(bool enable);
     126    void setFrameFlatteningEnabled(bool enable);
    127127    void setAllowUniversalAccessFromFileURLs(bool enable);
    128128    void setAllowFileAccessFromFileURLs(bool enable);
  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r56566 r56718  
    797797        prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
    798798        prefsPrivate->setXSSAuditorEnabled(FALSE);
    799         prefsPrivate->setFrameSetFlatteningEnabled(FALSE);
     799        prefsPrivate->setFrameFlatteningEnabled(FALSE);
    800800        prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
    801801    }
  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r56606 r56718  
    388388}
    389389
    390 void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     390void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
    391391{
    392392    COMPtr<IWebView> webView;
     
    402402        return;
    403403
    404     prefsPrivate->setFrameSetFlatteningEnabled(enabled);
     404    prefsPrivate->setFrameFlatteningEnabled(enabled);
    405405}
    406406
  • trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r56309 r56718  
    171171}
    172172
    173 void LayoutTestController::setFrameSetFlatteningEnabled(bool enabled)
     173void LayoutTestController::setFrameFlatteningEnabled(bool enabled)
    174174{
    175175    // FIXME: implement
Note: See TracChangeset for help on using the changeset viewer.