<!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>[37489] trunk/WebKit/win</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/37489">37489</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2008-10-10 13:43:01 -0700 (Fri, 10 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Bug 21526: The hashmap webPreferencesInstances in WebPreferences.cpp can 
        potentially hold onto stale instances of WebPreferences
        https://bugs.webkit.org/show_bug.cgi?id=21526
        
        webPreferencesInstances now keeps a reference to all the instances it holds.
        Fix up callers of WebPreferences::removeReferenceForIdentifier() to call 
        it after they have released their references to the WebPreferences objects.

        Reviewed by Adam Roben.

        * WebPreferences.cpp:
        (WebPreferences::getInstanceForIdentifier):
        (WebPreferences::removeReferenceForIdentifier):
        * WebView.cpp:
        (WebView::close):
        (WebView::setPreferences):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebPreferencescpp">trunk/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkWebKitwinWebViewcpp">trunk/WebKit/win/WebView.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (37488 => 37489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2008-10-10 20:27:51 UTC (rev 37488)
+++ trunk/WebKit/win/ChangeLog        2008-10-10 20:43:01 UTC (rev 37489)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2008-10-10  Ada Chan  &lt;adachan@apple.com&gt;
+
+        Bug 21526: The hashmap webPreferencesInstances in WebPreferences.cpp can 
+        potentially hold onto stale instances of WebPreferences
+        https://bugs.webkit.org/show_bug.cgi?id=21526
+        
+        webPreferencesInstances now keeps a reference to all the instances it holds.
+        Fix up callers of WebPreferences::removeReferenceForIdentifier() to call 
+        it after they have released their references to the WebPreferences objects.
+
+        Reviewed by Adam Roben.
+
+        * WebPreferences.cpp:
+        (WebPreferences::getInstanceForIdentifier):
+        (WebPreferences::removeReferenceForIdentifier):
+        * WebView.cpp:
+        (WebView::close):
+        (WebView::setPreferences):
+
</ins><span class="cx"> 2008-10-06  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Enable viewless Mac WebKit to paint some basic pages.
</span></span></pre></div>
<a id="trunkWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebPreferences.cpp (37488 => 37489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebPreferences.cpp        2008-10-10 20:27:51 UTC (rev 37488)
+++ trunk/WebKit/win/WebPreferences.cpp        2008-10-10 20:43:01 UTC (rev 37489)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include &quot;WebKit.h&quot;
</span><span class="cx"> #include &quot;WebKitDLL.h&quot;
</span><span class="cx"> #include &quot;WebPreferences.h&quot;
</span><del>-#include &quot;WebKit.h&quot;
</del><span class="cx"> 
</span><ins>+#include &quot;COMPtr.h&quot;
</ins><span class="cx"> #include &quot;WebNotificationCenter.h&quot;
</span><span class="cx"> #include &quot;WebPreferenceKeysPrivate.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> 
</span><span class="cx"> static CFDictionaryRef defaultSettings;
</span><span class="cx"> 
</span><del>-static HashMap&lt;WebCore::String, WebPreferences*&gt; webPreferencesInstances;
</del><ins>+static HashMap&lt;WebCore::String, COMPtr&lt;WebPreferences&gt; &gt; webPreferencesInstances;
</ins><span class="cx"> 
</span><span class="cx"> WebPreferences* WebPreferences::sharedStandardPreferences()
</span><span class="cx"> {
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">         return sharedStandardPreferences();
</span><span class="cx"> 
</span><span class="cx">     WebCore::String identifierString(identifier, SysStringLen(identifier));
</span><del>-    return webPreferencesInstances.get(identifierString);
</del><ins>+    return webPreferencesInstances.get(identifierString).get();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPreferences::setInstance(WebPreferences* instance, BSTR identifier)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     WebCore::String identifierString(identifier, SysStringLen(identifier));
</span><del>-    WebPreferences* webPreference = webPreferencesInstances.get(identifierString);
</del><ins>+    WebPreferences* webPreference = webPreferencesInstances.get(identifierString).get();
</ins><span class="cx">     if (webPreference &amp;&amp; webPreference-&gt;m_refCount == 1)
</span><span class="cx">         webPreferencesInstances.remove(identifierString);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebView.cpp (37488 => 37489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebView.cpp        2008-10-10 20:27:51 UTC (rev 37488)
+++ trunk/WebKit/win/WebView.cpp        2008-10-10 20:43:01 UTC (rev 37489)
</span><span class="lines">@@ -611,14 +611,17 @@
</span><span class="cx">     notifyCenter-&gt;removeObserver(this, WebPreferences::webPreferencesChangedNotification(), static_cast&lt;IWebPreferences*&gt;(m_preferences.get()));
</span><span class="cx"> 
</span><span class="cx">     BSTR identifier = 0;
</span><del>-    if (SUCCEEDED(m_preferences-&gt;identifier(&amp;identifier)))
-        WebPreferences::removeReferenceForIdentifier(identifier);
-    if (identifier)
-        SysFreeString(identifier);
</del><ins>+    m_preferences-&gt;identifier(&amp;identifier);
</ins><span class="cx"> 
</span><span class="cx">     COMPtr&lt;WebPreferences&gt; preferences = m_preferences;
</span><span class="cx">     m_preferences = 0;
</span><span class="cx">     preferences-&gt;didRemoveFromWebView();
</span><ins>+    // Make sure we release the reference, since WebPreferences::removeReferenceForIdentifier will check for last reference to WebPreferences
+    preferences = 0;
+    if (identifier) {
+        WebPreferences::removeReferenceForIdentifier(identifier);
+        SysFreeString(identifier);
+    }
</ins><span class="cx"> 
</span><span class="cx">     deleteBackingStore();
</span><span class="cx"> }
</span><span class="lines">@@ -2681,18 +2684,18 @@
</span><span class="cx">     IWebNotificationCenter* nc = WebNotificationCenter::defaultCenterInternal();
</span><span class="cx">     nc-&gt;removeObserver(this, WebPreferences::webPreferencesChangedNotification(), static_cast&lt;IWebPreferences*&gt;(m_preferences.get()));
</span><span class="cx"> 
</span><del>-    BSTR identifierBSTR = 0;
-    HRESULT hr = oldPrefs-&gt;identifier(&amp;identifierBSTR);
</del><ins>+    BSTR identifier = 0;
+    oldPrefs-&gt;identifier(&amp;identifier);
</ins><span class="cx">     oldPrefs-&gt;didRemoveFromWebView();
</span><span class="cx">     oldPrefs = 0; // Make sure we release the reference, since WebPreferences::removeReferenceForIdentifier will check for last reference to WebPreferences
</span><del>-    if (SUCCEEDED(hr)) {
-        BString identifier;
-        identifier.adoptBSTR(identifierBSTR);
</del><ins>+
+    m_preferences = webPrefs;
+
+    if (identifier) {
</ins><span class="cx">         WebPreferences::removeReferenceForIdentifier(identifier);
</span><ins>+        SysFreeString(identifier);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_preferences = webPrefs;
-
</del><span class="cx">     nc-&gt;addObserver(this, WebPreferences::webPreferencesChangedNotification(), static_cast&lt;IWebPreferences*&gt;(m_preferences.get()));
</span><span class="cx"> 
</span><span class="cx">     m_preferences-&gt;postPreferencesChangesNotification();
</span></span></pre>
</div>
</div>

</body>
</html>