Changeset 56718 in webkit
- Timestamp:
- Mar 29, 2010 7:03:06 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 47 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r56717 r56718 1 2010-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 1 18 2010-03-29 Csaba Osztrogonác <ossy@webkit.org> 2 19 -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html
r54440 r56718 7 7 if (window.layoutTestController) { 8 8 layoutTestController.waitUntilDone(); 9 layoutTestController.setFrame SetFlatteningEnabled(true);9 layoutTestController.setFrameFlatteningEnabled(true); 10 10 } 11 11 -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html
r56547 r56718 6 6 if (window.layoutTestController) { 7 7 layoutTestController.waitUntilDone(); 8 layoutTestController.setFrame SetFlatteningEnabled(true);8 layoutTestController.setFrameFlatteningEnabled(true); 9 9 } 10 10 -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
r54440 r56718 6 6 if (window.layoutTestController) { 7 7 layoutTestController.waitUntilDone(); 8 layoutTestController.setFrame SetFlatteningEnabled(true);8 layoutTestController.setFrameFlatteningEnabled(true); 9 9 } 10 10 -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html
r54440 r56718 7 7 if (window.layoutTestController) { 8 8 layoutTestController.waitUntilDone(); 9 layoutTestController.setFrame SetFlatteningEnabled(true);9 layoutTestController.setFrameFlatteningEnabled(true); 10 10 } 11 11 } -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html
r54440 r56718 7 7 if (window.layoutTestController) { 8 8 layoutTestController.waitUntilDone(); 9 layoutTestController.setFrame SetFlatteningEnabled(true);9 layoutTestController.setFrameFlatteningEnabled(true); 10 10 } 11 11 -
trunk/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframe-resize-expected.txt
r54441 r56718 6 6 RenderFrame {FRAME} at (0,0) size 300x650 7 7 layer at (0,0) size 300x650 8 RenderView at (0,0) size 300x6509 layer at (0,0) size 300x65010 RenderBlock {HTML} at (0,0) size 300x65011 RenderBody {BODY} at (8,8) size 2 84x626[bgcolor=#008000]12 RenderBlock {P} at (0,0) size 2 84x408 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 13 13 RenderText {#text} at (0,0) size 260x40 14 14 text run at (0,0) width 223: "Test for frameset flattening. The" 15 15 text run at (0,20) width 260: "flattening only works inside the DRT." 16 RenderBlock {P} at (0,56) size 2 84x4016 RenderBlock {P} at (0,56) size 268x40 17 17 RenderText {#text} at (0,0) size 266x40 18 18 text run at (0,0) width 266: "This frame should be 300px wide and" -
trunk/WebCore/ChangeLog
r56716 r56718 1 2010-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 1 36 2010-03-29 Andrei Popescu <andreip@google.com> 2 37 -
trunk/WebCore/WebCore.base.exp
r56479 r56718 688 688 __ZN7WebCore8Settings27setLocalStorageDatabasePathERKNS_6StringE 689 689 __ZN7WebCore8Settings28setForceFTPDirectoryListingsEb 690 __ZN7WebCore8Settings2 8setFrameSetFlatteningEnabledEb690 __ZN7WebCore8Settings25setFrameFlatteningEnabledEb 691 691 __ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb 692 692 __ZN7WebCore8Settings29setWebArchiveDebugModeEnabledEb -
trunk/WebCore/page/FrameView.cpp
r56646 r56718 619 619 Node* body = document->body(); 620 620 if (body && body->renderer()) { 621 if (body->hasTagName(framesetTag) && !m_frame->settings()->frame SetFlatteningEnabled()) {621 if (body->hasTagName(framesetTag) && !m_frame->settings()->frameFlatteningEnabled()) { 622 622 body->renderer()->setChildNeedsLayout(true); 623 623 vMode = ScrollbarAlwaysOff; … … 1257 1257 // When frameset flattening is enabled, the contents of the frame affects layout of the parent frames. 1258 1258 // Also invalidate parent frame starting from the owner element of this frame. 1259 if (m_frame->settings()->frame SetFlatteningEnabled() && m_frame->ownerRenderer())1259 if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer() && m_frame->ownerElement()->hasTagName(frameTag)) 1260 1260 m_frame->ownerRenderer()->setNeedsLayout(true, true); 1261 1261 -
trunk/WebCore/page/Settings.cpp
r55976 r56718 99 99 , m_needsSiteSpecificQuirks(false) 100 100 , m_fontRenderingMode(0) 101 , m_frame SetFlatteningEnabled(false)101 , m_frameFlatteningEnabled(false) 102 102 , m_webArchiveDebugModeEnabled(false) 103 103 , m_localFileContentSniffingEnabled(false) … … 439 439 } 440 440 441 void Settings::setFrame SetFlatteningEnabled(bool frameSetFlatteningEnabled)442 { 443 m_frame SetFlatteningEnabled = frameSetFlatteningEnabled;441 void Settings::setFrameFlatteningEnabled(bool frameFlatteningEnabled) 442 { 443 m_frameFlatteningEnabled = frameFlatteningEnabled; 444 444 } 445 445 -
trunk/WebCore/page/Settings.h
r56046 r56718 209 209 bool developerExtrasEnabled() const { return m_developerExtrasEnabled; } 210 210 211 void setFrame SetFlatteningEnabled(bool);212 bool frame SetFlatteningEnabled() const { return m_frameSetFlatteningEnabled; }211 void setFrameFlatteningEnabled(bool); 212 bool frameFlatteningEnabled() const { return m_frameFlatteningEnabled; } 213 213 214 214 void setAuthorAndUserStylesEnabled(bool); … … 350 350 bool m_needsSiteSpecificQuirks : 1; 351 351 unsigned m_fontRenderingMode : 1; 352 bool m_frame SetFlatteningEnabled : 1;352 bool m_frameFlatteningEnabled : 1; 353 353 bool m_webArchiveDebugModeEnabled : 1; 354 354 bool m_localFileContentSniffingEnabled : 1; -
trunk/WebCore/rendering/RenderFrame.cpp
r54440 r56718 60 60 } 61 61 62 void RenderFrame::layoutWithFlattening(bool fixedWidth, bool fixedHeight)63 {64 // NOTE: The width and height have been set at this point by65 // 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 height72 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 correctly81 updateWidgetPosition();82 if (childRoot->prefWidthsDirty())83 childRoot->calcPrefWidths();84 85 // if scrollbars are off, and the width or height are fixed86 // we obey them and do not expand. With frame flattening87 // no subframe much ever become scrollable.88 89 bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;90 91 // make sure minimum preferred width is enforced92 if (isScrollable || !fixedWidth || childRoot->isFrameSet())93 setWidth(max(width(), childRoot->minPrefWidth()));94 95 // update again to pass the width to the child frame96 updateWidgetPosition();97 childFrameView->layout();98 99 // expand the frame by setting frame height = content height100 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 114 62 } // namespace WebCore -
trunk/WebCore/rendering/RenderFrame.h
r54440 r56718 36 36 37 37 FrameEdgeInfo edgeInfo() const; 38 void layoutWithFlattening(bool fixedWidth, bool fixedHeight);39 38 40 39 private: -
trunk/WebCore/rendering/RenderFrameSet.cpp
r54440 r56718 647 647 bool RenderFrameSet::flattenFrameSet() const 648 648 { 649 return document()->frame() && document()->frame()->settings()->frame SetFlatteningEnabled();649 return document()->frame() && document()->frame()->settings()->frameFlatteningEnabled(); 650 650 } 651 651 -
trunk/WebCore/rendering/RenderFrameSet.h
r54440 r56718 71 71 bool canResizeColumn(const IntPoint&) const; 72 72 73 bool flattenFrameSet() const;74 75 73 private: 76 74 static const int noSplit = -1; … … 98 96 virtual void paint(PaintInfo&, int tx, int ty); 99 97 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const; 100 98 101 99 inline HTMLFrameSetElement* frameSet() const; 100 101 bool flattenFrameSet() const; 102 102 103 103 void setIsResizing(bool); -
trunk/WebCore/rendering/RenderPart.cpp
r52947 r56718 25 25 #include "RenderPart.h" 26 26 27 #include "RenderView.h" 27 28 #include "Frame.h" 28 29 #include "FrameView.h" 30 #include "HTMLFrameElement.h" 29 31 30 32 namespace WebCore { … … 55 57 } 56 58 59 void 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 57 116 void RenderPart::viewCleared() 58 117 { -
trunk/WebCore/rendering/RenderPart.h
r52947 r56718 36 36 RenderPart(Element*); 37 37 virtual ~RenderPart(); 38 38 39 39 bool hasFallbackContent() const { return m_hasFallbackContent; } 40 40 41 41 virtual void setWidget(PassRefPtr<Widget>); 42 42 virtual void viewCleared(); 43 44 void layoutWithFlattening(bool fixedWidth, bool fixedHeight); 43 45 44 46 protected: -
trunk/WebCore/rendering/RenderPartObject.cpp
r52947 r56718 36 36 #include "RenderView.h" 37 37 #include "RenderWidgetProtector.h" 38 #include "Settings.h" 38 39 #include "Text.h" 39 40 … … 51 52 } 52 53 54 bool 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 69 void RenderPartObject::calcHeight() 70 { 71 RenderPart::calcHeight(); 72 if (flattenFrame()) 73 setHeight(max(height(), static_cast<FrameView*>(widget())->contentsHeight())); 74 } 75 76 void RenderPartObject::calcWidth() 77 { 78 RenderPart::calcWidth(); 79 if (flattenFrame()) 80 setWidth(max(width(), static_cast<FrameView*>(widget())->contentsWidth())); 81 } 82 53 83 void RenderPartObject::layout() 54 84 { … … 57 87 calcWidth(); 58 88 calcHeight(); 89 90 if (flattenFrame()) { 91 layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed()); 92 return; 93 } 59 94 60 95 RenderPart::layout(); -
trunk/WebCore/rendering/RenderPartObject.h
r52947 r56718 33 33 RenderPartObject(Element*); 34 34 35 virtual void calcHeight(); 36 virtual void calcWidth(); 37 35 38 private: 36 39 virtual const char* renderName() const { return "RenderPartObject"; } … … 39 42 40 43 virtual void viewCleared(); 44 45 bool flattenFrame() const; 41 46 }; 42 47 -
trunk/WebKit/mac/ChangeLog
r56667 r56718 1 2010-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 1 17 2010-03-27 Darin Adler <darin@apple.com> 2 18 -
trunk/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
r54873 r56718 92 92 #define WebKitUsesProxiedOpenPanelPreferenceKey @"WebKitUsesProxiedOpenPanel" 93 93 #define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime" 94 #define WebKitFrame SetFlatteningEnabledPreferenceKey @"WebKitFrameSetFlatteningEnabled"94 #define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled" 95 95 96 96 // These are private both because callers should be using the cover methods and because the -
trunk/WebKit/mac/WebView/WebPreferences.mm
r54873 r56718 358 358 [NSNumber numberWithBool:NO], WebKitUsesProxiedOpenPanelPreferenceKey, 359 359 [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey, 360 [NSNumber numberWithBool:NO], WebKitFrame SetFlatteningEnabledPreferenceKey,360 [NSNumber numberWithBool:NO], WebKitFrameFlatteningEnabledPreferenceKey, 361 361 nil]; 362 362 … … 1217 1217 } 1218 1218 1219 - (BOOL)isFrame SetFlatteningEnabled1220 { 1221 return [self _boolValueForKey:WebKitFrame SetFlatteningEnabledPreferenceKey];1222 } 1223 1224 - (void)setFrame SetFlatteningEnabled:(BOOL)flag1225 { 1226 [self _setBoolValue:flag forKey:WebKitFrame SetFlatteningEnabledPreferenceKey];1219 - (BOOL)isFrameFlatteningEnabled 1220 { 1221 return [self _boolValueForKey:WebKitFrameFlatteningEnabledPreferenceKey]; 1222 } 1223 1224 - (void)setFrameFlatteningEnabled:(BOOL)flag 1225 { 1226 [self _setBoolValue:flag forKey:WebKitFrameFlatteningEnabledPreferenceKey]; 1227 1227 } 1228 1228 -
trunk/WebKit/mac/WebView/WebPreferencesPrivate.h
r54873 r56718 117 117 - (void)setPluginAllowedRunTime:(unsigned)allowedRunTime; 118 118 119 - (BOOL)isFrame SetFlatteningEnabled;120 - (void)setFrame SetFlatteningEnabled:(BOOL)flag;119 - (BOOL)isFrameFlatteningEnabled; 120 - (void)setFrameFlatteningEnabled:(BOOL)flag; 121 121 122 122 // zero means do AutoScale -
trunk/WebKit/mac/WebView/WebView.mm
r55701 r56718 1352 1352 settings->setWebGLEnabled([preferences webGLEnabled]); 1353 1353 settings->setLoadDeferringEnabled(shouldEnableLoadDeferring()); 1354 settings->setFrame SetFlatteningEnabled([preferences isFrameSetFlatteningEnabled]);1354 settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]); 1355 1355 } 1356 1356 -
trunk/WebKit/qt/Api/qwebpage.cpp
r56552 r56718 147 147 } 148 148 149 void QWEBKIT_EXPORT qt_drt_setFrame SetFlatteningEnabled(QWebPage* page, bool enabled)150 { 151 QWebPagePrivate::core(page)->settings()->setFrame SetFlatteningEnabled(enabled);149 void QWEBKIT_EXPORT qt_drt_setFrameFlatteningEnabled(QWebPage* page, bool enabled) 150 { 151 QWebPagePrivate::core(page)->settings()->setFrameFlatteningEnabled(enabled); 152 152 } 153 153 -
trunk/WebKit/qt/Api/qwebsettings.cpp
r56537 r56718 198 198 value = attributes.value(QWebSettings::FrameFlatteningEnabled, 199 199 global->attributes.value(QWebSettings::FrameFlatteningEnabled)); 200 settings->setFrame SetFlatteningEnabled(value);200 settings->setFrameFlatteningEnabled(value); 201 201 202 202 QUrl location = !userStyleSheetLocation.isEmpty() ? userStyleSheetLocation : global->userStyleSheetLocation; … … 242 242 global->attributes.value(QWebSettings::XSSAuditingEnabled)); 243 243 settings->setXSSAuditorEnabled(value); 244 244 245 245 #if ENABLE(TILED_BACKING_STORE) 246 246 value = attributes.value(QWebSettings::TiledBackingStoreEnabled, -
trunk/WebKit/qt/ChangeLog
r56705 r56718 1 2010-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 1 13 2010-03-28 Alexey Proskuryakov <ap@apple.com> 2 14 -
trunk/WebKit/qt/symbian/eabi/QtWebKitu.def
r56611 r56718 708 708 _Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME 709 709 _Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME 710 _Z35qt_drt_setFrame SetFlatteningEnabledP8QWebPageb @ 709 NONAME710 _Z35qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME 711 711 _Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME 712 712 _Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME -
trunk/WebKit/win/ChangeLog
r56507 r56718 1 2010-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 1 18 2010-03-24 Jon Honeycutt <jhoneycutt@apple.com> 2 19 -
trunk/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
r56118 r56718 80 80 HRESULT setXSSAuditorEnabled([in] BOOL enabled); 81 81 82 HRESULT isFrame SetFlatteningEnabled([out, retval] BOOL *enabled);83 HRESULT setFrame SetFlatteningEnabled([in] BOOL enabled);82 HRESULT isFrameFlatteningEnabled([out, retval] BOOL *enabled); 83 HRESULT setFrameFlatteningEnabled([in] BOOL enabled); 84 84 85 85 HRESULT experimentalNotificationsEnabled([out, retval] BOOL *enabled); -
trunk/WebKit/win/WebPreferenceKeysPrivate.h
r56118 r56718 132 132 #define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime" 133 133 134 #define WebKitFrame SetFlatteningEnabledPreferenceKey "WebKitFrameSetFlatteningEnabled"134 #define WebKitFrameFlatteningEnabledPreferenceKey "WebKitFrameFlatteningEnabled" 135 135 136 136 #define WebKitAcceleratedCompositingEnabledPreferenceKey "WebKitAcceleratedCompositingEnabled" -
trunk/WebKit/win/WebPreferences.cpp
r56118 r56718 208 208 CFDictionaryAddValue(defaults, CFSTR(WebKitAllowFileAccessFromFileURLsPreferenceKey), kCFBooleanTrue); 209 209 CFDictionaryAddValue(defaults, CFSTR(WebKitXSSAuditorEnabledPreferenceKey), kCFBooleanTrue); 210 CFDictionaryAddValue(defaults, CFSTR(WebKitFrame SetFlatteningEnabledPreferenceKey), kCFBooleanFalse);210 CFDictionaryAddValue(defaults, CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), kCFBooleanFalse); 211 211 CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue); 212 212 CFDictionaryAddValue(defaults, CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue); … … 824 824 } 825 825 826 HRESULT STDMETHODCALLTYPE WebPreferences::isFrame SetFlatteningEnabled(827 /* [retval][out] */ BOOL* enabled) 828 { 829 *enabled = boolValueForKey(CFSTR(WebKitFrame SetFlatteningEnabledPreferenceKey));830 return S_OK; 831 } 832 833 HRESULT STDMETHODCALLTYPE WebPreferences::setFrame SetFlatteningEnabled(834 /* [in] */ BOOL enabled) 835 { 836 setBoolValue(CFSTR(WebKitFrame SetFlatteningEnabledPreferenceKey), enabled);826 HRESULT STDMETHODCALLTYPE WebPreferences::isFrameFlatteningEnabled( 827 /* [retval][out] */ BOOL* enabled) 828 { 829 *enabled = boolValueForKey(CFSTR(WebKitFrameFlatteningEnabledPreferenceKey)); 830 return S_OK; 831 } 832 833 HRESULT STDMETHODCALLTYPE WebPreferences::setFrameFlatteningEnabled( 834 /* [in] */ BOOL enabled) 835 { 836 setBoolValue(CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), enabled); 837 837 return S_OK; 838 838 } -
trunk/WebKit/win/WebPreferences.h
r56118 r56718 387 387 /* [retval][out] */ UINT* allowedRunTime); 388 388 389 virtual HRESULT STDMETHODCALLTYPE isFrame SetFlatteningEnabled(389 virtual HRESULT STDMETHODCALLTYPE isFrameFlatteningEnabled( 390 390 /* [retval][out] */ BOOL* enabled); 391 391 392 virtual HRESULT STDMETHODCALLTYPE setFrame SetFlatteningEnabled(392 virtual HRESULT STDMETHODCALLTYPE setFrameFlatteningEnabled( 393 393 /* [in] */ BOOL enabled); 394 394 -
trunk/WebKit/win/WebView.cpp
r56118 r56718 4678 4678 settings->setPluginAllowedRunTime(runTime); 4679 4679 4680 hr = prefsPrivate->isFrame SetFlatteningEnabled(&enabled);4680 hr = prefsPrivate->isFrameFlatteningEnabled(&enabled); 4681 4681 if (FAILED(hr)) 4682 4682 return hr; 4683 settings->setFrame SetFlatteningEnabled(enabled);4683 settings->setFrameFlatteningEnabled(enabled); 4684 4684 4685 4685 #if USE(ACCELERATED_COMPOSITING) -
trunk/WebKitTools/ChangeLog
r56701 r56718 1 2010-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 1 30 2010-03-28 Gustavo Noronha Silva <gns@gnome.org> 2 31 -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp
r56606 r56718 935 935 936 936 937 static JSValueRef setFrame SetFlatteningEnabledCallback(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->setFrame SetFlatteningEnabled(JSValueToBoolean(context, arguments[0]));937 static 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])); 945 945 946 946 return JSValueMakeUndefined(context); … … 1483 1483 { "setXSSAuditorEnabled", setXSSAuditorEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1484 1484 { "setSpatialNavigationEnabled", setSpatialNavigationEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1485 { "setFrame SetFlatteningEnabled", setFrameSetFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },1485 { "setFrameFlatteningEnabled", setFrameFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1486 1486 { "setSelectTrailingWhitespaceEnabled", setSelectTrailingWhitespaceEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1487 1487 { "setSmartInsertDeleteEnabled", setSmartInsertDeleteEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.h
r56606 r56718 94 94 void setUserStyleSheetLocation(JSStringRef path); 95 95 void setXSSAuditorEnabled(bool flag); 96 void setFrame SetFlatteningEnabled(bool enable);96 void setFrameFlatteningEnabled(bool enable); 97 97 void setSpatialNavigationEnabled(bool enable); 98 98 -
trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
r56661 r56718 348 348 } 349 349 350 void LayoutTestController::setFrame SetFlatteningEnabled(bool flag)350 void LayoutTestController::setFrameFlatteningEnabled(bool flag) 351 351 { 352 352 // FIXME: implement -
trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
r56597 r56718 428 428 [preferences setDeveloperExtrasEnabled:NO]; 429 429 [preferences setLoadsImagesAutomatically:YES]; 430 [preferences setFrame SetFlatteningEnabled:NO];430 [preferences setFrameFlatteningEnabled:NO]; 431 431 if (persistentUserStyleSheetLocation) { 432 432 [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]]; -
trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
r56606 r56718 330 330 } 331 331 332 void LayoutTestController::setFrame SetFlatteningEnabled(bool enabled)333 { 334 [[[mainFrame webView] preferences] setFrame SetFlatteningEnabled:enabled];332 void LayoutTestController::setFrameFlatteningEnabled(bool enabled) 333 { 334 [[[mainFrame webView] preferences] setFrameFlatteningEnabled:enabled]; 335 335 } 336 336 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r56661 r56718 192 192 193 193 m_drt->layoutTestController()->setCaretBrowsingEnabled(false); 194 m_drt->layoutTestController()->setFrame SetFlatteningEnabled(false);194 m_drt->layoutTestController()->setFrameFlatteningEnabled(false); 195 195 196 196 // globalSettings must be reset explicitly. -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r56661 r56718 41 41 extern void qt_dump_resource_load_callbacks(bool b); 42 42 extern void qt_drt_setMediaType(QWebFrame* qframe, const QString& type); 43 extern void qt_drt_setFrame SetFlatteningEnabled(QWebPage*, bool);43 extern void qt_drt_setFrameFlatteningEnabled(QWebPage*, bool); 44 44 extern void qt_drt_setJavaScriptProfilingEnabled(QWebFrame*, bool enabled); 45 45 extern void qt_drt_setTimelineProfilingEnabled(QWebPage*, bool enabled); … … 318 318 } 319 319 320 void LayoutTestController::setFrame SetFlatteningEnabled(bool enabled)321 { 322 qt_drt_setFrame SetFlatteningEnabled(m_drt->webPage(), enabled);320 void LayoutTestController::setFrameFlatteningEnabled(bool enabled) 321 { 322 qt_drt_setFrameFlatteningEnabled(m_drt->webPage(), enabled); 323 323 } 324 324 -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
r56606 r56718 124 124 125 125 void setMediaType(const QString& type); 126 void setFrame SetFlatteningEnabled(bool enable);126 void setFrameFlatteningEnabled(bool enable); 127 127 void setAllowUniversalAccessFromFileURLs(bool enable); 128 128 void setAllowFileAccessFromFileURLs(bool enable); -
trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
r56566 r56718 797 797 prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592> 798 798 prefsPrivate->setXSSAuditorEnabled(FALSE); 799 prefsPrivate->setFrame SetFlatteningEnabled(FALSE);799 prefsPrivate->setFrameFlatteningEnabled(FALSE); 800 800 prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE); 801 801 } -
trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
r56606 r56718 388 388 } 389 389 390 void LayoutTestController::setFrame SetFlatteningEnabled(bool enabled)390 void LayoutTestController::setFrameFlatteningEnabled(bool enabled) 391 391 { 392 392 COMPtr<IWebView> webView; … … 402 402 return; 403 403 404 prefsPrivate->setFrame SetFlatteningEnabled(enabled);404 prefsPrivate->setFrameFlatteningEnabled(enabled); 405 405 } 406 406 -
trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
r56309 r56718 171 171 } 172 172 173 void LayoutTestController::setFrame SetFlatteningEnabled(bool enabled)173 void LayoutTestController::setFrameFlatteningEnabled(bool enabled) 174 174 { 175 175 // FIXME: implement
Note: See TracChangeset
for help on using the changeset viewer.