Changeset 140717 in webkit
- Timestamp:
- Jan 24, 2013 1:37:51 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r140713 r140717 1 2013-01-24 Erik Arvidsson <arv@chromium.org> 2 3 Unreviewed, rolling out r140703. 4 http://trac.webkit.org/changeset/140703 5 https://bugs.webkit.org/show_bug.cgi?id=107556 6 7 r140561 was not the reason for the Android breakage 8 9 * DumpRenderTree/chromium/TestShell.cpp: 10 (TestShell::~TestShell): 11 (TestShell::closeWindow): 12 * DumpRenderTree/chromium/WebViewHost.cpp: 13 (WebViewHost::WebViewHost): 14 (WebViewHost::~WebViewHost): 15 (WebViewHost::shutdown): 16 * DumpRenderTree/chromium/WebViewHost.h: 17 (WebViewHost): 18 1 19 2013-01-24 Dean Jackson <dino@apple.com> 2 20 -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r140703 r140717 203 203 m_testRunner->setWebView(0); 204 204 m_drtDevToolsAgent->setWebView(0); 205 if (m_webViewHost) 206 m_webViewHost->shutdown(); 205 207 } 206 208 … … 795 797 focusedWidget = 0; 796 798 799 window->shutdown(); 797 800 delete window; 798 801 // We set the focused widget after deleting the web view host because it -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp
r140703 r140717 1082 1082 , m_proxy(0) 1083 1083 , m_webWidget(0) 1084 , m_shutdownWasInvoked(false) 1084 1085 { 1085 1086 reset(); … … 1088 1089 WebViewHost::~WebViewHost() 1089 1090 { 1091 ASSERT(m_shutdownWasInvoked); 1092 if (m_inModalLoop) 1093 webkit_support::QuitMessageLoop(); 1094 } 1095 1096 void WebViewHost::shutdown() 1097 { 1098 ASSERT(!m_shutdownWasInvoked); 1099 1090 1100 // DevTools frontend page is supposed to be navigated only once and 1091 1101 // loading another URL in that Page is an error. … … 1102 1112 m_layerTreeView.clear(); 1103 1113 webWidget()->close(); 1104 if (m_inModalLoop)1105 webkit_support::QuitMessageLoop();1114 m_webWidget = 0; 1115 m_shutdownWasInvoked = true; 1106 1116 } 1107 1117 -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.h
r140703 r140717 80 80 WebViewHost(TestShell*); 81 81 virtual ~WebViewHost(); 82 void shutdown(); 82 83 void setWebWidget(WebKit::WebWidget*); 83 84 WebKit::WebView* webView() const; … … 372 373 bool m_hasWindow; 373 374 bool m_inModalLoop; 375 376 bool m_shutdownWasInvoked; 377 374 378 WebKit::WebRect m_windowRect; 375 379
Note: See TracChangeset
for help on using the changeset viewer.