Changeset 119127 in webkit
- Timestamp:
- May 31, 2012 11:11:55 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r119116 r119127 1 2012-05-31 Alexey Proskuryakov <ap@apple.com> 2 3 [WK2] window.internals settings are not reset between tests 4 https://bugs.webkit.org/show_bug.cgi?id=87783 5 6 Reviewed by Mihai Parparita. 7 8 * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: 9 (WTR::InjectedBundle::done): Call resetAfterTest(). 10 11 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: 12 (WTR::InjectedBundlePage::prepare): Renamed from "reset" for clarity. 13 (WTR::InjectedBundlePage::resetAfterTest): Added a function that resets internals. 14 This needs to be done after a tets, because the code assumes that there is an object 15 with this name in global scope. 16 17 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: 18 1 19 2012-05-31 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> 2 20 -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
r116338 r119127 231 231 m_layoutTestController->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates")); 232 232 233 page()-> reset();233 page()->prepare(); 234 234 235 235 WKBundleClearAllDatabases(m_bundle); … … 261 261 262 262 closeOtherPages(); 263 263 264 page()->resetAfterTest(); 265 264 266 m_state = Idle; 265 267 } -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
r118397 r119127 331 331 } 332 332 333 void InjectedBundlePage:: reset()333 void InjectedBundlePage::prepare() 334 334 { 335 335 WKBundlePageClearMainFrameName(m_page); … … 346 346 347 347 WKBundlePageSetTracksRepaints(m_page, false); 348 } 349 350 void InjectedBundlePage::resetAfterTest() 351 { 352 WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page); 353 JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame); 354 #if PLATFORM(QT) 355 DumpRenderTreeSupportQt::injectInternalsObject(context); 356 #else 357 WebCoreTestSupport::resetInternalsObject(context); 358 #endif 348 359 } 349 360 -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
r117276 r119127 43 43 void stopLoading(); 44 44 45 void reset(); 45 void prepare(); 46 void resetAfterTest(); 46 47 47 48 void dumpBackForwardList();
Note: See TracChangeset
for help on using the changeset viewer.