Changeset 53294 in webkit
- Timestamp:
- Jan 14, 2010 3:08:46 PM (14 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r53264 r53294 1 2010-01-14 Gustavo Noronha Silva <gns@gnome.org> 2 3 Reviewed by Oliver Hunter. 4 5 [GTK] couple fixes for signal emissions, and property notifications 6 https://bugs.webkit.org/show_bug.cgi?id=33428 7 8 Do not emit signals and property notifications for error 9 pages. The notifications are not really useful for anything, you 10 can get them back by overriding the error pages, and it avoids a 11 number of hacks. 12 13 * WebCoreSupport/FrameLoaderClientGtk.cpp: 14 (WebKit::FrameLoaderClient::FrameLoaderClient): 15 (WebKit::FrameLoaderClient::dispatchDidFinishLoad): 16 (WebKit::FrameLoaderClient::dispatchDidReceiveIcon): 17 (WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad): 18 (WebKit::FrameLoaderClient::dispatchDidReceiveTitle): 19 (WebKit::FrameLoaderClient::dispatchDidCommitLoad): 20 (WebKit::FrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout): 21 (WebKit::FrameLoaderClient::dispatchDidFailLoad): 22 * WebCoreSupport/FrameLoaderClientGtk.h: 23 * tests/testloading.c: 24 (load_error_status_changed_cb): 25 (test_loading_error): 26 1 27 2010-01-14 Martin Robinson <martin.james.robinson@gmail.com> 2 28 … … 38 64 (webkit_web_view_query_tooltip): Added 39 65 40 2010-01- 12Gustavo Noronha Silva <gns@gnome.org>66 2010-01-09 Gustavo Noronha Silva <gns@gnome.org> 41 67 42 68 Reviewed by Xan Lopez. -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r53138 r53294 78 78 : m_frame(frame) 79 79 , m_policyDecision(0) 80 , m_loadingErrorPage(false) 80 81 , m_pluginView(0) 81 82 , m_hasSentResponseToPlugin(false) … … 569 570 void FrameLoaderClient::dispatchDidFinishLoad() 570 571 { 572 if (m_loadingErrorPage) { 573 m_loadingErrorPage = false; 574 return; 575 } 576 571 577 loadDone(m_frame, true); 572 578 } … … 704 710 void FrameLoaderClient::dispatchDidReceiveIcon() 705 711 { 712 if (m_loadingErrorPage) 713 return; 714 706 715 WebKitWebView* webView = getViewFromFrame(m_frame); 707 716 … … 716 725 void FrameLoaderClient::dispatchDidStartProvisionalLoad() 717 726 { 727 if (m_loadingErrorPage) 728 return; 729 718 730 notifyStatus(m_frame, WEBKIT_LOAD_PROVISIONAL); 719 731 } … … 721 733 void FrameLoaderClient::dispatchDidReceiveTitle(const String& title) 722 734 { 735 if (m_loadingErrorPage) 736 return; 737 723 738 WebKitWebFramePrivate* priv = m_frame->priv; 724 739 g_free(priv->title); … … 737 752 void FrameLoaderClient::dispatchDidCommitLoad() 738 753 { 754 if (m_loadingErrorPage) 755 return; 756 739 757 /* Update the URI once first data has been received. 740 758 * This means the URI is valid and successfully identify the page that's going to be loaded. … … 777 795 void FrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout() 778 796 { 797 if (m_loadingErrorPage) 798 return; 799 779 800 notifyStatus(m_frame, WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT); 780 801 } … … 938 959 void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error) 939 960 { 961 if (m_loadingErrorPage) 962 return; 963 940 964 notifyStatus(m_frame, WEBKIT_LOAD_FAILED); 941 965 … … 956 980 return; 957 981 } 982 983 m_loadingErrorPage = true; 958 984 959 985 String content; -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r51644 r53294 185 185 WebKitWebPolicyDecision* m_policyDecision; 186 186 187 bool m_loadingErrorPage; 188 187 189 // Plugin view to redirect data to 188 190 WebCore::PluginView* m_pluginView; -
trunk/WebKit/gtk/tests/testloading.c
r53138 r53294 172 172 switch(status) { 173 173 case WEBKIT_LOAD_PROVISIONAL: 174 /* We are going to go through here twice, so don't assert 175 * anything */ 174 g_assert(!fixture->has_been_provisional); 176 175 fixture->has_been_provisional = TRUE; 177 176 break; … … 184 183 g_assert(fixture->has_been_load_error); 185 184 g_assert(fixture->has_been_failed); 186 /* We are checking that only one FINISHED is received in the187 whole cycle, so assert it's FALSE */188 185 g_assert(!fixture->has_been_finished); 189 186 fixture->has_been_finished = TRUE; … … 222 219 223 220 g_main_loop_run(fixture->loop); 221 222 g_assert(fixture->has_been_provisional); 223 g_assert(fixture->has_been_committed); 224 g_assert(fixture->has_been_load_error); 225 g_assert(fixture->has_been_failed); 226 g_assert(fixture->has_been_finished); 224 227 } 225 228 -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r53256 r53294 2428 2428 * 2429 2429 * Connect to "notify::load-status" to monitor loading. 2430 * 2431 * Some versions of WebKitGTK+ emitted this signal for the default 2432 * error page, while loading it. This behavior was considered bad, 2433 * because it was essentially exposing an implementation 2434 * detail. From 1.1.19 onwards this signal is no longer emitted for 2435 * the default error pages, but keep in mind that if you override 2436 * the error pages by using webkit_web_frame_load_alternate_string() 2437 * the signals will be emitted. 2430 2438 * 2431 2439 * Since: 1.1.7
Note: See TracChangeset
for help on using the changeset viewer.