Changeset 140557 in webkit
- Timestamp:
- Jan 23, 2013 11:13:50 AM (11 years ago)
- Location:
- trunk/Source/WebKit/gtk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/gtk/ChangeLog
r140498 r140557 1 2013-01-23 Manuel Rego Casasnovas <rego@igalia.com> 2 3 [GTK] Avoid reset title for navigation within the page 4 https://bugs.webkit.org/show_bug.cgi?id=106908 5 6 Reviewed by Martin Robinson. 7 8 * WebCoreSupport/FrameLoaderClientGtk.cpp: 9 (WebKit::FrameLoaderClient::dispatchDidNavigateWithinPage): Call 10 dispatchDidCommitLoad with true as param. 11 (WebKit::FrameLoaderClient::dispatchDidCommitLoad): The method has been 12 overloaded. The default implementation (without params) simply calls 13 dispatchDidCommitLoad with false. The new private method with 14 isNavigatingWithinPage as param will avoid to reset the title for 15 navigation within the page. 16 * WebCoreSupport/FrameLoaderClientGtk.h: 17 (FrameLoaderClient): Add new private method dispatchDidCommitLoad with a 18 boolean parameter to know if it is navigating withing the same page or 19 not. 20 1 21 2013-01-22 Anders Carlsson <andersca@apple.com> 2 22 -
trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r137845 r140557 767 767 // current contract with the clients about provisional data 768 768 // sources not being '0' during the provisional load stage. 769 dispatchDidCommitLoad( );769 dispatchDidCommitLoad(true); 770 770 dispatchDidFinishLoad(); 771 771 } … … 842 842 void FrameLoaderClient::dispatchDidCommitLoad() 843 843 { 844 FrameLoaderClient::dispatchDidCommitLoad(false); 845 } 846 847 void FrameLoaderClient::dispatchDidCommitLoad(bool isNavigatingWithinPage) 848 { 844 849 if (m_loadingErrorPage) 845 850 return; … … 853 858 g_free(priv->uri); 854 859 priv->uri = g_strdup(core(m_frame)->loader()->activeDocumentLoader()->url().string().utf8().data()); 855 g_free(priv->title);856 priv->title = NULL;857 860 g_object_notify(G_OBJECT(m_frame), "uri"); 858 g_object_notify(G_OBJECT(m_frame), "title"); 861 if (!isNavigatingWithinPage) { 862 g_free(priv->title); 863 priv->title = 0; 864 g_object_notify(G_OBJECT(m_frame), "title"); 865 } 859 866 860 867 g_signal_emit_by_name(m_frame, "load-committed"); … … 865 872 g_object_freeze_notify(G_OBJECT(webView)); 866 873 g_object_notify(G_OBJECT(webView), "uri"); 867 g_object_notify(G_OBJECT(webView), "title");868 874 g_object_thaw_notify(G_OBJECT(webView)); 875 if (!isNavigatingWithinPage) 876 g_object_notify(G_OBJECT(webView), "title"); 869 877 g_signal_emit_by_name(webView, "load-committed", m_frame); 870 878 } -
trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r137845 r140557 199 199 WebCore::PluginView* m_pluginView; 200 200 bool m_hasSentResponseToPlugin; 201 202 virtual void dispatchDidCommitLoad(bool isNavigatingWithinPage); 201 203 }; 202 204
Note: See TracChangeset
for help on using the changeset viewer.