[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [124152] branches/safari-536.26-branch/Source/WebKit2
From: lforschler () apple ! com
Date: 2012-07-31 2:17:49
Message-ID: 20120731021749.F0F4C4A1645 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[124152] branches/safari-536.26-branch/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/124152">124152</a></dd> \
<dt>Author</dt> <dd>lforschler@apple.com</dd> <dt>Date</dt> <dd>2012-07-30 19:17:49 \
-0700 (Mon, 30 Jul 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/123658">r123658</a>. \
<rdar://problem/11961131></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53626branchSourceWebKit2ChangeLog">branches/safari-536.26-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53626branchSourceWebKit2WebProcessPluginsPluginViewcpp">b \
ranches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53626branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebKit2/ChangeLog (124151 => 124152)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-07-31 02:15:46 UTC (rev \
124151)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-07-31 02:17:49 UTC \
(rev 124152) </span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2012-07-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge 123658
+
+ 2012-07-25 Anders Carlsson <andersca@apple.com>
+
+ Crash when calling PluginView::pluginFocusOrWindowFocusChanged when the \
web page is null + https://bugs.webkit.org/show_bug.cgi?id=92289
+ <rdar://problem/11785352>
+
+ Reviewed by Andreas Kling.
+
+ Plug-in views that outlive their containing web page for various reasons \
(such as being protected from + destruction) need to null check the web \
page. +
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::pluginFocusOrWindowFocusChanged):
+ (WebKit::PluginView::setComplexTextInputState):
+
+2012-07-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge 123649
</span><span class="cx">
</span><span class="cx"> 2012-07-25 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari53626branchSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: \
branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp \
(124151 => 124152)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-07-31 \
02:15:46 UTC (rev 124151)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-07-31 \
02:17:49 UTC (rev 124152) </span><span class="lines">@@ -1163,12 +1163,14 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void PluginView::pluginFocusOrWindowFocusChanged(bool \
pluginHasFocusAndWindowHasFocus) </span><span class="cx"> {
</span><del>- m_webPage->send(Messages::WebPageProxy::PluginFocusOrWindowFocusChanged(m_plugin->pluginComplexTextInputIdentifier(), \
pluginHasFocusAndWindowHasFocus)); </del><ins>+ if (m_webPage)
+ m_webPage->send(Messages::WebPageProxy::PluginFocusOrWindowFocusChanged(m_plugin->pluginComplexTextInputIdentifier(), \
pluginHasFocusAndWindowHasFocus)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void \
PluginView::setComplexTextInputState(PluginComplexTextInputState \
pluginComplexTextInputState) </span><span class="cx"> {
</span><del>- m_webPage->send(Messages::WebPageProxy::SetPluginComplexTextInputState(m_plugin->pluginComplexTextInputIdentifier(), \
pluginComplexTextInputState)); </del><ins>+ if (m_webPage)
+ m_webPage->send(Messages::WebPageProxy::SetPluginComplexTextInputState(m_plugin->pluginComplexTextInputIdentifier(), \
pluginComplexTextInputState)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> mach_port_t PluginView::compositingRenderServerPort()
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic