Changeset 59623 in webkit
- Timestamp:
- May 17, 2010 12:36:36 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r59616 r59623 1 2010-05-17 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Disable Icon Database by default in Qt DRT 6 7 Unskip: 8 http/tests/misc/favicon-loads-with-images-disabled.html 9 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html 10 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html 11 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html 12 13 Qt returns 5 (QNetworkReply::OperationCanceledError) instead of -999 for the XFrameOptions tests, 14 so update accordingly. 15 16 https://bugs.webkit.org/show_bug.cgi?id=37382 17 18 * platform/qt/Skipped: 19 * platform/qt/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt: Added. Qt returns 5 instead of -999. 20 * platform/qt/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt: Added. Qt returns 5 instead of -999. 21 * platform/qt/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt: Added. Qt returns 5 instead of -999. 22 1 23 2010-05-17 David Hyatt <hyatt@apple.com> 2 24 -
trunk/LayoutTests/platform/qt/Skipped
r59602 r59623 275 275 http/tests/xmlhttprequest/default-content-type-dashboard.html 276 276 http/tests/xmlhttprequest/svg-created-by-xhr-disallowed-in-dashboard.html 277 278 # Missing layoutTestController.setIconDatabaseEnabled()279 http/tests/misc/favicon-loads-with-images-disabled.html280 277 281 278 # Missing layoutTestController.setCustomPolicyDelegate() … … 4752 4749 4753 4750 4754 # Have an additional line in results for GET of favicon.ico. Probably innocuous.4755 # https://bugs.webkit.org/show_bug.cgi?id=373824756 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html4757 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html4758 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html4759 4760 4751 # Skip failing http/tests/security tests 4761 4752 http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW.html -
trunk/WebKitTools/ChangeLog
r59595 r59623 1 2010-05-17 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Disable Icon Database by default in Qt DRT 6 7 Unskip: 8 http/tests/misc/favicon-loads-with-images-disabled.html 9 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html 10 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html 11 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html 12 13 https://bugs.webkit.org/show_bug.cgi?id=37382 14 15 Add support for layoutTestController.setIconDatabaseEnabled and layoutTestController.disableImageLoading(). 16 The XFrameOptions tests were failing because of an extra resource load callback for favicon.ico requests. 17 These extra callbacks are removed by supporting both of the above layoutTestContoller commands. 18 19 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 20 (WebCore::WebPage::resetSettings): 21 (WebCore::DumpRenderTree::DumpRenderTree): 22 * DumpRenderTree/qt/DumpRenderTreeQt.h: 23 (WebCore::DumpRenderTree::drtStoragePath): 24 * DumpRenderTree/qt/LayoutTestControllerQt.cpp: 25 (LayoutTestController::reset): 26 (LayoutTestController::disableImageLoading): 27 (LayoutTestController::setIconDatabaseEnabled): 28 * DumpRenderTree/qt/LayoutTestControllerQt.h: 29 1 30 2010-05-17 Fumitoshi Ukai <ukai@chromium.org> 2 31 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r59580 r59623 189 189 settings()->resetAttribute(QWebSettings::PluginsEnabled); 190 190 settings()->resetAttribute(QWebSettings::JavaScriptCanAccessClipboard); 191 settings()->resetAttribute(QWebSettings::AutoLoadImages); 191 192 192 193 m_drt->layoutTestController()->setCaretBrowsingEnabled(false); … … 340 341 , m_enableTextOutput(false) 341 342 , m_singleFileMode(false) 343 , m_persistentStoragePath(QString(getenv("DUMPRENDERTREE_TEMP"))) 342 344 { 343 345 DumpRenderTreeSupportQt::overwritePluginDirectories(); 344 346 345 char* dumpRenderTreeTemp = getenv("DUMPRENDERTREE_TEMP"); 346 if (dumpRenderTreeTemp) 347 QWebSettings::enablePersistentStorage(QString(dumpRenderTreeTemp)); 348 else 349 QWebSettings::enablePersistentStorage(); 347 QWebSettings::enablePersistentStorage(m_persistentStoragePath); 350 348 351 349 // create our primary testing page/view. -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
r59076 r59623 87 87 EventSender *eventSender() const { return m_eventSender; } 88 88 TextInputController *textInputController() const { return m_textInputController; } 89 QString persistentStoragePath() const { return m_persistentStoragePath; } 89 90 90 91 QWebPage *createWindow(); … … 142 143 bool m_enableTextOutput; 143 144 bool m_singleFileMode; 145 QString m_persistentStoragePath; 144 146 }; 145 147 -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r59580 r59623 71 71 DumpRenderTreeSupportQt::setWillSendRequestReturnsNull(false); 72 72 DumpRenderTreeSupportQt::setWillSendRequestClearHeaders(QStringList()); 73 setIconDatabaseEnabled(false); 73 74 emit hidePage(); 74 75 } … … 457 458 void LayoutTestController::disableImageLoading() 458 459 { 459 // FIXME: Implement for testing fix for https://bugs.webkit.org/show_bug.cgi?id=27896 460 // Also need to make sure image loading is re-enabled for each new test. 460 m_drt->webPage()->settings()->setAttribute(QWebSettings::AutoLoadImages, false); 461 461 } 462 462 … … 631 631 } 632 632 633 void LayoutTestController::setIconDatabaseEnabled(bool enable) 634 { 635 if (enable && !m_drt->persistentStoragePath().isEmpty()) 636 QWebSettings::setIconDatabasePath(m_drt->persistentStoragePath()); 637 else 638 QWebSettings::setIconDatabasePath(QString()); 639 } 640 633 641 const unsigned LayoutTestController::maxViewWidth = 800; 634 642 const unsigned LayoutTestController::maxViewHeight = 600; -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
r59573 r59623 170 170 void setDatabaseQuota(int size); 171 171 void clearAllDatabases(); 172 void setIconDatabaseEnabled(bool enable); 172 173 173 174 void waitForPolicyDelegate();
Note: See TracChangeset
for help on using the changeset viewer.