<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194890] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194890">194890</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-12 03:41:21 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] UI process crashes if webkit_web_view_get_tls_info is called before internal load-committed event
https://bugs.webkit.org/show_bug.cgi?id=142375
Reviewed by Michael Catanzaro.
Remove all the hacks to emit delayed load events now that the
page cache resource load delegates are consistent with all other
resource loads.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewLoadChanged):
(webkitWebViewResourceLoadStarted):
(webkit_web_view_get_tls_info): Add a g_return_val_if_fail to
prevent this function from being misused.
(webkitWebViewDisconnectMainResourceResponseChangedSignalHandler): Deleted.
(webkitWebViewDispose): Deleted.
(webkitWebViewEmitLoadChanged): Deleted.
(webkitWebViewEmitDelayedLoadEvents): Deleted.
(mainResourceResponseChangedCallback): Deleted.
(waitForMainResourceResponseIfWaitingForResource): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194889 => 194890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-12 08:29:19 UTC (rev 194889)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-12 11:41:21 UTC (rev 194890)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] UI process crashes if webkit_web_view_get_tls_info is called before internal load-committed event
+ https://bugs.webkit.org/show_bug.cgi?id=142375
+
+ Reviewed by Michael Catanzaro.
+
+ Remove all the hacks to emit delayed load events now that the
+ page cache resource load delegates are consistent with all other
+ resource loads.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewLoadChanged):
+ (webkitWebViewResourceLoadStarted):
+ (webkit_web_view_get_tls_info): Add a g_return_val_if_fail to
+ prevent this function from being misused.
+ (webkitWebViewDisconnectMainResourceResponseChangedSignalHandler): Deleted.
+ (webkitWebViewDispose): Deleted.
+ (webkitWebViewEmitLoadChanged): Deleted.
+ (webkitWebViewEmitDelayedLoadEvents): Deleted.
+ (mainResourceResponseChangedCallback): Deleted.
+ (waitForMainResourceResponseIfWaitingForResource): Deleted.
+
</ins><span class="cx"> 2016-01-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r190717): [GTK] Popup menus stop working after being dismissed without selecting an item
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (194889 => 194890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-01-12 08:29:19 UTC (rev 194889)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-01-12 11:41:21 UTC (rev 194890)
</span><span class="lines">@@ -179,9 +179,6 @@
</span><span class="cx"> bool isLoading;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PageLoadStateObserver> loadObserver;
</span><del>- bool waitingForMainResource;
- unsigned long mainResourceResponseHandlerID;
- WebKitLoadEvent lastDelayedEvent;
</del><span class="cx">
</span><span class="cx"> GRefPtr<WebKitBackForwardList> backForwardList;
</span><span class="cx"> GRefPtr<WebKitSettings> settings;
</span><span class="lines">@@ -250,11 +247,6 @@
</span><span class="cx"> }
</span><span class="cx"> virtual void didChangeIsLoading() override
</span><span class="cx"> {
</span><del>- if (m_webView->priv->waitingForMainResource) {
- // The actual load has finished but we haven't emitted the delayed load events yet, so we are still loading.
- g_object_thaw_notify(G_OBJECT(m_webView));
- return;
- }
</del><span class="cx"> webkitWebViewSetIsLoading(m_webView, getPage(m_webView)->pageLoadState().isLoading());
</span><span class="cx"> g_object_thaw_notify(G_OBJECT(m_webView));
</span><span class="cx"> }
</span><span class="lines">@@ -514,14 +506,6 @@
</span><span class="cx"> g_signal_handlers_disconnect_by_func(settings, reinterpret_cast<gpointer>(userAgentChanged), webView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(WebKitWebView* webView)
-{
- WebKitWebViewPrivate* priv = webView->priv;
- if (priv->mainResourceResponseHandlerID)
- g_signal_handler_disconnect(priv->mainResource.get(), priv->mainResourceResponseHandlerID);
- priv->mainResourceResponseHandlerID = 0;
-}
-
</del><span class="cx"> static void webkitWebViewWatchForChangesInFavicon(WebKitWebView* webView)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewPrivate* priv = webView->priv;
</span><span class="lines">@@ -772,7 +756,6 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = WEBKIT_WEB_VIEW(object);
</span><span class="cx"> webkitWebViewCancelFaviconRequest(webView);
</span><del>- webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView);
</del><span class="cx"> webkitWebViewDisconnectSettingsSignalHandlers(webView);
</span><span class="cx"> webkitWebViewDisconnectFaviconDatabaseSignalHandlers(webView);
</span><span class="cx">
</span><span class="lines">@@ -1792,73 +1775,31 @@
</span><span class="cx"> webView->priv->authenticationRequest.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void webkitWebViewEmitLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent, bool isDelayedEvent)
-{
- if (loadEvent == WEBKIT_LOAD_STARTED) {
- webkitWebViewWatchForChangesInFavicon(webView);
- webkitWebViewCancelAuthenticationRequest(webView);
- } else if (loadEvent == WEBKIT_LOAD_FINISHED) {
- if (isDelayedEvent) {
- // In case of the delayed event, we need to manually set is-loading to false.
- webkitWebViewSetIsLoading(webView, false);
- }
- webkitWebViewCancelAuthenticationRequest(webView);
- webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView);
- }
-
- g_signal_emit(webView, signals[LOAD_CHANGED], 0, loadEvent);
-
- if (isDelayedEvent) {
- if (loadEvent == WEBKIT_LOAD_COMMITTED)
- webView->priv->waitingForMainResource = false;
- else if (loadEvent == WEBKIT_LOAD_FINISHED) {
- // Manually set is-loading again in case a new load was started.
- webkitWebViewSetIsLoading(webView, getPage(webView)->pageLoadState().isLoading());
- }
- }
-}
-
-static void webkitWebViewEmitDelayedLoadEvents(WebKitWebView* webView)
-{
- WebKitWebViewPrivate* priv = webView->priv;
- if (!priv->waitingForMainResource)
- return;
- ASSERT(priv->lastDelayedEvent == WEBKIT_LOAD_COMMITTED || priv->lastDelayedEvent == WEBKIT_LOAD_FINISHED);
-
- if (priv->lastDelayedEvent == WEBKIT_LOAD_FINISHED)
- webkitWebViewEmitLoadChanged(webView, WEBKIT_LOAD_COMMITTED, true);
- webkitWebViewEmitLoadChanged(webView, priv->lastDelayedEvent, true);
-}
-
</del><span class="cx"> void webkitWebViewLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewPrivate* priv = webView->priv;
</span><del>- if (loadEvent == WEBKIT_LOAD_STARTED) {
- // Finish a possible previous load waiting for main resource.
- webkitWebViewEmitDelayedLoadEvents(webView);
-
</del><ins>+ switch (loadEvent) {
+ case WEBKIT_LOAD_STARTED:
</ins><span class="cx"> webkitWebViewCancelFaviconRequest(webView);
</span><ins>+ webkitWebViewWatchForChangesInFavicon(webView);
+ webkitWebViewCancelAuthenticationRequest(webView);
</ins><span class="cx"> priv->loadingResourcesMap.clear();
</span><del>- priv->mainResource = 0;
- priv->waitingForMainResource = false;
- } else if (loadEvent == WEBKIT_LOAD_COMMITTED) {
</del><ins>+ priv->mainResource = nullptr;
+ break;
+ case WEBKIT_LOAD_COMMITTED: {
</ins><span class="cx"> WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context.get());
</span><span class="cx"> GUniquePtr<char> faviconURI(webkit_favicon_database_get_favicon_uri(database, priv->activeURI.data()));
</span><span class="cx"> webkitWebViewUpdateFaviconURI(webView, faviconURI.get());
</span><del>-
- if (!priv->mainResource) {
- // When a page is loaded from the history cache, the main resource load callbacks
- // are called when the main frame load is finished. We want to make sure there's a
- // main resource available when load has been committed, so we delay the emission of
- // load-changed signal until main resource object has been created.
- priv->waitingForMainResource = true;
- }
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ case WEBKIT_LOAD_FINISHED:
+ webkitWebViewCancelAuthenticationRequest(webView);
+ break;
+ default:
+ break;
+ }
</ins><span class="cx">
</span><del>- if (priv->waitingForMainResource)
- priv->lastDelayedEvent = loadEvent;
- else
- webkitWebViewEmitLoadChanged(webView, loadEvent, false);
</del><ins>+ g_signal_emit(webView, signals[LOAD_CHANGED], 0, loadEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkitWebViewLoadFailed(WebKitWebView* webView, WebKitLoadEvent loadEvent, const char* failingURI, GError *error)
</span><span class="lines">@@ -1996,32 +1937,13 @@
</span><span class="cx"> g_signal_connect(printOperation.leakRef(), "finished", G_CALLBACK(g_object_unref), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void mainResourceResponseChangedCallback(WebKitWebResource*, GParamSpec*, WebKitWebView* webView)
-{
- webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView);
- webkitWebViewEmitDelayedLoadEvents(webView);
-}
-
-static void waitForMainResourceResponseIfWaitingForResource(WebKitWebView* webView)
-{
- WebKitWebViewPrivate* priv = webView->priv;
- if (!priv->waitingForMainResource)
- return;
-
- webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView);
- priv->mainResourceResponseHandlerID =
- g_signal_connect(priv->mainResource.get(), "notify::response", G_CALLBACK(mainResourceResponseChangedCallback), webView);
-}
-
</del><span class="cx"> void webkitWebViewResourceLoadStarted(WebKitWebView* webView, WebFrameProxy* frame, uint64_t resourceIdentifier, WebKitURIRequest* request)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewPrivate* priv = webView->priv;
</span><span class="cx"> bool isMainResource = frame->isMainFrame() && !priv->mainResource;
</span><span class="cx"> WebKitWebResource* resource = webkitWebResourceCreate(frame, request, isMainResource);
</span><del>- if (isMainResource) {
</del><ins>+ if (isMainResource)
</ins><span class="cx"> priv->mainResource = resource;
</span><del>- waitForMainResourceResponseIfWaitingForResource(webView);
- }
</del><span class="cx"> priv->loadingResourcesMap.set(resourceIdentifier, adoptGRef(resource));
</span><span class="cx"> g_signal_emit(webView, signals[RESOURCE_LOAD_STARTED], 0, resource, request);
</span><span class="cx"> }
</span><span class="lines">@@ -3469,7 +3391,10 @@
</span><span class="cx"> if (!mainFrame)
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- const WebCore::CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
</del><ins>+ auto* wkCertificateInfo = mainFrame->certificateInfo();
+ g_return_val_if_fail(wkCertificateInfo, FALSE);
+
+ const auto& certificateInfo = wkCertificateInfo->certificateInfo();
</ins><span class="cx"> if (certificate)
</span><span class="cx"> *certificate = certificateInfo.certificate();
</span><span class="cx"> if (errors)
</span></span></pre>
</div>
</div>
</body>
</html>