<!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>[38321] trunk/WebCore</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/38321">38321</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2008-11-11 16:28:57 -0800 (Tue, 11 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-11-11  Sam Weinig  &lt;sam@webkit.org&gt;

        Reviewed by Dan Bernstein.

        Fix for https://bugs.webkit.org/show_bug.cgi?id=22189
        Track CachedScript decoded data

        We now track the decoded size of CachedScripts in the Cache allowing
        them to accounted for when deciding when to evict data.  The decoded
        data itself can be evicted when Cache pressure gets high enough through
        CachedScript::destroyDecodedData.

        * loader/CachedResource.h:
        (WebCore::CachedResource::allClientsRemoved):
        (WebCore::CachedResource::destroyDecodedData):
        * loader/CachedScript.cpp:
        (WebCore::CachedScript::script):
        (WebCore::CachedScript::data):
        (WebCore::CachedScript::destroyDecodedData):
        * loader/CachedScript.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderCachedResourceh">trunk/WebCore/loader/CachedResource.h</a></li>
<li><a href="#trunkWebCoreloaderCachedScriptcpp">trunk/WebCore/loader/CachedScript.cpp</a></li>
<li><a href="#trunkWebCoreloaderCachedScripth">trunk/WebCore/loader/CachedScript.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38320 => 38321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-11 23:39:15 UTC (rev 38320)
+++ trunk/WebCore/ChangeLog        2008-11-12 00:28:57 UTC (rev 38321)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2008-11-11  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=22189
+        Track CachedScript decoded data
+
+        We now track the decoded size of CachedScripts in the Cache allowing
+        them to accounted for when deciding when to evict data.  The decoded
+        data itself can be evicted when Cache pressure gets high enough through
+        CachedScript::destroyDecodedData.
+
+        * loader/CachedResource.h:
+        (WebCore::CachedResource::allClientsRemoved):
+        (WebCore::CachedResource::destroyDecodedData):
+        * loader/CachedScript.cpp:
+        (WebCore::CachedScript::script):
+        (WebCore::CachedScript::data):
+        (WebCore::CachedScript::destroyDecodedData):
+        * loader/CachedScript.h:
+
</ins><span class="cx"> 2008-11-11  Cameron Zwarich  &lt;zwarich@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Geoff Garen.
</span></span></pre></div>
<a id="trunkWebCoreloaderCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/CachedResource.h (38320 => 38321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/CachedResource.h        2008-11-11 23:39:15 UTC (rev 38320)
+++ trunk/WebCore/loader/CachedResource.h        2008-11-12 00:28:57 UTC (rev 38321)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">     PreloadResult preloadResult() const { return m_preloadResult; }
</span><span class="cx">     void setRequestedFromNetworkingLayer() { m_requestedFromNetworkingLayer = true; }
</span><span class="cx">         
</span><del>-    virtual void allClientsRemoved() { };
</del><ins>+    virtual void allClientsRemoved() { }
</ins><span class="cx"> 
</span><span class="cx">     unsigned count() const { return m_clients.size(); }
</span><span class="cx"> 
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">     bool errorOccurred() const { return m_errorOccurred; }
</span><span class="cx">     bool sendResourceLoadCallbacks() const { return m_sendResourceLoadCallbacks; }
</span><span class="cx">     
</span><del>-    virtual void destroyDecodedData() {};
</del><ins>+    virtual void destroyDecodedData() { }
</ins><span class="cx"> 
</span><span class="cx">     void setDocLoader(DocLoader* docLoader) { m_docLoader = docLoader; }
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkWebCoreloaderCachedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/CachedScript.cpp (38320 => 38321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/CachedScript.cpp        2008-11-11 23:39:15 UTC (rev 38320)
+++ trunk/WebCore/loader/CachedScript.cpp        2008-11-12 00:28:57 UTC (rev 38321)
</span><span class="lines">@@ -70,6 +70,16 @@
</span><span class="cx">     return m_encoding.name();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const String&amp; CachedScript::script()
+{
+    if (!m_script &amp;&amp; m_data) {
+        m_script = m_encoding.decode(m_data-&gt;data(), encodedSize());
+        setDecodedSize(m_script.length() * sizeof(UChar));
+    }
+
+    return m_script;
+}
+
</ins><span class="cx"> void CachedScript::data(PassRefPtr&lt;SharedBuffer&gt; data, bool allDataReceived)
</span><span class="cx"> {
</span><span class="cx">     if (!allDataReceived)
</span><span class="lines">@@ -77,8 +87,6 @@
</span><span class="cx"> 
</span><span class="cx">     m_data = data;
</span><span class="cx">     setEncodedSize(m_data.get() ? m_data-&gt;size() : 0);
</span><del>-    if (m_data.get())
-        m_script = m_encoding.decode(m_data-&gt;data(), encodedSize());
</del><span class="cx">     m_loading = false;
</span><span class="cx">     checkNotify();
</span><span class="cx"> }
</span><span class="lines">@@ -100,4 +108,10 @@
</span><span class="cx">     checkNotify();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void CachedScript::destroyDecodedData()
+{
+    m_script = String();
+    setDecodedSize(0);
</ins><span class="cx"> }
</span><ins>+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkWebCoreloaderCachedScripth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/CachedScript.h (38320 => 38321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/CachedScript.h        2008-11-11 23:39:15 UTC (rev 38320)
+++ trunk/WebCore/loader/CachedScript.h        2008-11-12 00:28:57 UTC (rev 38321)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">         CachedScript(const String&amp; url, const String&amp; charset);
</span><span class="cx">         virtual ~CachedScript();
</span><span class="cx"> 
</span><del>-        const String&amp; script() const { return m_script; }
</del><ins>+        const String&amp; script();
</ins><span class="cx"> 
</span><span class="cx">         virtual void addClient(CachedResourceClient*);
</span><span class="cx"> 
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> 
</span><span class="cx">         void checkNotify();
</span><span class="cx"> 
</span><ins>+        virtual void destroyDecodedData();
+
</ins><span class="cx">     private:
</span><span class="cx">         String m_script;
</span><span class="cx">         TextEncoding m_encoding;
</span></span></pre>
</div>
</div>

</body>
</html>