<!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>[194529] trunk/Source/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/194529">194529</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 03:30:16 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the CachedScript ASCII optimization.
<https://webkit.org/b/152596>
Reviewed by Antti Koivisto.
There's actually no need to keep a non-copying StringImpl around for the
CachedScript's internal SharedBuffer. Get rid of that so we don't need
to fidget with that string when the SharedBuffer changes underneath.
Renamed CachedScript::ASCIIOptimizationState to DecodingState to better
reflect what it's used for. Also added explicit caching of the string
hash since we can't rely on a StringImpl to keep that around now.
Bonus: Implement Darin's suggestion to let TextEncoding answer whether
an encoding is byte-based and thus eligible for the ASCII optimization.
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::tryReplaceEncodedData): Deleted.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::didReplaceSharedBufferContents): Deleted.
* loader/cache/CachedScript.cpp:
(WebCore::CachedScript::script):
(WebCore::CachedScript::scriptHash):
(WebCore::encodingMayBeAllASCII): Deleted.
(WebCore::CachedScript::didReplaceSharedBufferContents): Deleted.
* loader/cache/CachedScript.h:
* platform/text/TextEncoding.h:
(WebCore::TextEncoding::isByteBasedEncoding):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScriptcpp">trunk/Source/WebCore/loader/cache/CachedScript.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScripth">trunk/Source/WebCore/loader/cache/CachedScript.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingh">trunk/Source/WebCore/platform/text/TextEncoding.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/ChangeLog 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-04 Andreas Kling <akling@apple.com>
+
+ Simplify the CachedScript ASCII optimization.
+ <https://webkit.org/b/152596>
+
+ Reviewed by Antti Koivisto.
+
+ There's actually no need to keep a non-copying StringImpl around for the
+ CachedScript's internal SharedBuffer. Get rid of that so we don't need
+ to fidget with that string when the SharedBuffer changes underneath.
+
+ Renamed CachedScript::ASCIIOptimizationState to DecodingState to better
+ reflect what it's used for. Also added explicit caching of the string
+ hash since we can't rely on a StringImpl to keep that around now.
+
+ Bonus: Implement Darin's suggestion to let TextEncoding answer whether
+ an encoding is byte-based and thus eligible for the ASCII optimization.
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::tryReplaceEncodedData): Deleted.
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::didReplaceSharedBufferContents): Deleted.
+ * loader/cache/CachedScript.cpp:
+ (WebCore::CachedScript::script):
+ (WebCore::CachedScript::scriptHash):
+ (WebCore::encodingMayBeAllASCII): Deleted.
+ (WebCore::CachedScript::didReplaceSharedBufferContents): Deleted.
+ * loader/cache/CachedScript.h:
+ * platform/text/TextEncoding.h:
+ (WebCore::TextEncoding::isByteBasedEncoding):
+
</ins><span class="cx"> 2016-01-04 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] A video element isn't drawn onto the canvas.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -792,7 +792,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_data->tryReplaceContentsWithPlatformBuffer(newBuffer)) {
</span><del>- didReplaceSharedBufferContents();
</del><span class="cx"> // FIXME: Should we call checkNotify() here to move already-decoded images to the new data source?
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -267,8 +267,6 @@
</span><span class="cx"> void setDecodedSize(unsigned);
</span><span class="cx"> void didAccessDecodedData(double timeStamp);
</span><span class="cx">
</span><del>- virtual void didReplaceSharedBufferContents() { }
-
</del><span class="cx"> // FIXME: Make the rest of these data members private and use functions in derived classes instead.
</span><span class="cx"> HashCountedSet<CachedResourceClient*> m_clients;
</span><span class="cx"> ResourceRequest m_resourceRequest;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -69,52 +69,46 @@
</span><span class="cx"> return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)).lower();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool encodingMayBeAllASCII(const String& encoding)
-{
- return encoding == "UTF-8" || encoding == "ISO-8859-1" || encoding == "ASCII";
-}
-
</del><span class="cx"> StringView CachedScript::script()
</span><span class="cx"> {
</span><del>- if (!m_script && m_data) {
- if (m_ASCIIOptimizationState == Unknown
- && encodingMayBeAllASCII(encoding())
- && m_data->size()
- && charactersAreAllASCII(reinterpret_cast<const LChar*>(m_data->data()), m_data->size())) {
</del><ins>+ if (!m_data)
+ return { };
</ins><span class="cx">
</span><del>- m_script = StringImpl::createWithoutCopying(reinterpret_cast<const LChar*>(m_data->data()), m_data->size());
- m_ASCIIOptimizationState = DataAndDecodedStringHaveSameBytes;
</del><ins>+ if (m_decodingState == NeverDecoded
+ && TextEncoding(encoding()).isByteBasedEncoding()
+ && m_data->size()
+ && charactersAreAllASCII(reinterpret_cast<const LChar*>(m_data->data()), m_data->size())) {
</ins><span class="cx">
</span><del>- // If the encoded and decoded data are the same, there is no decoded data cost!
- setDecodedSize(0);
- m_decodedDataDeletionTimer.stop();
- return m_script;
- }
</del><ins>+ m_decodingState = DataAndDecodedStringHaveSameBytes;
+
+ // If the encoded and decoded data are the same, there is no decoded data cost!
+ setDecodedSize(0);
+ m_decodedDataDeletionTimer.stop();
+
+ m_scriptHash = StringHasher::computeHashAndMaskTop8Bits(reinterpret_cast<const LChar*>(m_data->data()), m_data->size());
+ }
+
+ if (m_decodingState == DataAndDecodedStringHaveSameBytes)
+ return { reinterpret_cast<const LChar*>(m_data->data()), m_data->size() };
+
+ if (!m_script) {
</ins><span class="cx"> m_script = m_decoder->decodeAndFlush(m_data->data(), encodedSize());
</span><del>- m_ASCIIOptimizationState = DataAndDecodedStringHaveDifferentBytes;
</del><ins>+ m_scriptHash = m_script.impl()->hash();
+ m_decodingState = DataAndDecodedStringHaveDifferentBytes;
</ins><span class="cx"> setDecodedSize(m_script.sizeInBytes());
</span><span class="cx"> }
</span><del>- if (m_ASCIIOptimizationState == DataAndDecodedStringHaveDifferentBytes)
- m_decodedDataDeletionTimer.restart();
</del><ins>+
+ m_decodedDataDeletionTimer.restart();
</ins><span class="cx"> return m_script;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned CachedScript::scriptHash()
</span><span class="cx"> {
</span><del>- script();
- return m_script.impl()->hash();
</del><ins>+ if (m_decodingState == NeverDecoded)
+ script();
+ return m_scriptHash;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedScript::didReplaceSharedBufferContents()
-{
- // We receive this callback when the CachedResource's internal SharedBuffer has had its contents
- // replaced by the memory-mapping-of-file-backed-resources optimization. If m_script is just a
- // non-copying wrapper around the old SharedBuffer contents, we have to retarget it.
- if (m_ASCIIOptimizationState == DataAndDecodedStringHaveSameBytes)
- m_script = StringImpl::createWithoutCopying(reinterpret_cast<const LChar*>(m_data->data()), m_data->size());
- CachedResource::didReplaceSharedBufferContents();
-}
-
</del><span class="cx"> void CachedScript::finishLoading(SharedBuffer* data)
</span><span class="cx"> {
</span><span class="cx"> m_data = data;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.h 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx"> bool mimeTypeAllowedByNosniff() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void didReplaceSharedBufferContents() override;
-
</del><span class="cx"> private:
</span><span class="cx"> virtual bool mayTryReplaceEncodedData() const override { return true; }
</span><span class="cx">
</span><span class="lines">@@ -60,9 +58,10 @@
</span><span class="cx"> virtual void destroyDecodedData() override;
</span><span class="cx">
</span><span class="cx"> String m_script;
</span><ins>+ unsigned m_scriptHash { 0 };
</ins><span class="cx">
</span><del>- enum ASCIIResourceOptimizationState { Unknown, DataAndDecodedStringHaveSameBytes, DataAndDecodedStringHaveDifferentBytes };
- ASCIIResourceOptimizationState m_ASCIIOptimizationState { Unknown };
</del><ins>+ enum DecodingState { NeverDecoded, DataAndDecodedStringHaveSameBytes, DataAndDecodedStringHaveDifferentBytes };
+ DecodingState m_decodingState { NeverDecoded };
</ins><span class="cx">
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncoding.h (194528 => 194529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncoding.h 2016-01-04 11:15:07 UTC (rev 194528)
+++ trunk/Source/WebCore/platform/text/TextEncoding.h 2016-01-04 11:30:16 UTC (rev 194529)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> CString encode(StringView, UnencodableHandling) const;
</span><span class="cx">
</span><span class="cx"> UChar backslashAsCurrencySymbol() const;
</span><ins>+ bool isByteBasedEncoding() const { return !isNonByteBasedEncoding(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isNonByteBasedEncoding() const;
</span></span></pre>
</div>
</div>
</body>
</html>