<!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>[186649] trunk/Source</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/186649">186649</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 16:33:25 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Add 3 byte jump size.
https://bugs.webkit.org/show_bug.cgi?id=146425
Reviewed by Darin Adler.
Source/WebCore:
* contentextensions/DFABytecode.h:
(WebCore::ContentExtensions::smallestPossibleJumpSize):
* contentextensions/DFABytecodeCompiler.cpp:
(WebCore::ContentExtensions::appendZeroes):
(WebCore::ContentExtensions::DFABytecodeCompiler::compile):
* contentextensions/DFABytecodeInterpreter.cpp:
(WebCore::ContentExtensions::jumpSizeInBytes):
(WebCore::ContentExtensions::getJumpSize):
(WebCore::ContentExtensions::getJumpDistance):
Added DFABytecodeJumpSize::Int24.
Source/WebKit2:
* UIProcess/API/APIUserContentExtensionStore.h:
Increment CurrentContentExtensionFileVersion because of change in the bytecode.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeh">trunk/Source/WebCore/contentextensions/DFABytecode.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeCompilercpp">trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFABytecodeInterpretercpp">trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/ChangeLog        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-09 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Add 3 byte jump size.
+ https://bugs.webkit.org/show_bug.cgi?id=146425
+
+ Reviewed by Darin Adler.
+
+ * contentextensions/DFABytecode.h:
+ (WebCore::ContentExtensions::smallestPossibleJumpSize):
+ * contentextensions/DFABytecodeCompiler.cpp:
+ (WebCore::ContentExtensions::appendZeroes):
+ (WebCore::ContentExtensions::DFABytecodeCompiler::compile):
+ * contentextensions/DFABytecodeInterpreter.cpp:
+ (WebCore::ContentExtensions::jumpSizeInBytes):
+ (WebCore::ContentExtensions::getJumpSize):
+ (WebCore::ContentExtensions::getJumpDistance):
+ Added DFABytecodeJumpSize::Int24.
+
</ins><span class="cx"> 2015-07-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add better ASSERTs to learn more about what is going wrong in DocumentLoader::detachFromFrame()
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecode.h (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecode.h        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecode.h        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -83,8 +83,11 @@
</span><span class="cx"> enum DFABytecodeJumpSize {
</span><span class="cx"> Int8 = 0x10,
</span><span class="cx"> Int16 = 0x20,
</span><del>- Int32 = 0x30,
</del><ins>+ Int24 = 0x30,
+ Int32 = 0x40,
</ins><span class="cx"> };
</span><ins>+const int32_t Int24Max = (1 << 23) - 1;
+const int32_t Int24Min = -(1 << 23);
</ins><span class="cx">
</span><span class="cx"> static inline DFABytecodeJumpSize smallestPossibleJumpSize(int32_t longestPossibleJump)
</span><span class="cx"> {
</span><span class="lines">@@ -92,6 +95,8 @@
</span><span class="cx"> return Int8;
</span><span class="cx"> if (longestPossibleJump <= std::numeric_limits<int16_t>::max() && longestPossibleJump >= std::numeric_limits<int16_t>::min())
</span><span class="cx"> return Int16;
</span><ins>+ if (longestPossibleJump <= Int24Max && longestPossibleJump >= Int24Min)
+ return Int24;
</ins><span class="cx"> return Int32;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> case DFABytecodeJumpSize::Int16:
</span><span class="cx"> append<int16_t>(bytecode, 0); // This value will be set when linking.
</span><span class="cx"> break;
</span><ins>+ case DFABytecodeJumpSize::Int24:
+ append<uint16_t>(bytecode, 0);
+ append<int8_t>(bytecode, 0); // These values will be set when linking.
+ break;
</ins><span class="cx"> case DFABytecodeJumpSize::Int32:
</span><span class="cx"> append<int32_t>(bytecode, 0); // This value will be set when linking.
</span><span class="cx"> break;
</span><span class="lines">@@ -374,6 +378,11 @@
</span><span class="cx"> RELEASE_ASSERT(distance == static_cast<int16_t>(distance));
</span><span class="cx"> setBits<int16_t>(m_bytecode, linkRecord.jumpLocation, static_cast<int16_t>(distance));
</span><span class="cx"> break;
</span><ins>+ case Int24:
+ RELEASE_ASSERT(distance >= Int24Min && distance <= Int24Max);
+ setBits<uint16_t>(m_bytecode, linkRecord.jumpLocation, static_cast<uint16_t>(distance));
+ setBits<int8_t>(m_bytecode, linkRecord.jumpLocation + sizeof(int16_t), static_cast<int8_t>(distance >> 16));
+ break;
</ins><span class="cx"> case Int32:
</span><span class="cx"> setBits<int32_t>(m_bytecode, linkRecord.jumpLocation, distance);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFABytecodeInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> return sizeof(int8_t);
</span><span class="cx"> case Int16:
</span><span class="cx"> return sizeof(int16_t);
</span><ins>+ case Int24:
+ return sizeof(uint16_t) + sizeof(int8_t);
</ins><span class="cx"> case Int32:
</span><span class="cx"> return sizeof(int32_t);
</span><span class="cx"> default:
</span><span class="lines">@@ -64,7 +66,7 @@
</span><span class="cx"> static inline DFABytecodeJumpSize getJumpSize(const DFABytecode* bytecode, uint32_t bytecodeLength, uint32_t index)
</span><span class="cx"> {
</span><span class="cx"> DFABytecodeJumpSize jumpSize = static_cast<DFABytecodeJumpSize>(getBits<uint8_t>(bytecode, bytecodeLength, index) & DFABytecodeJumpSizeMask);
</span><del>- ASSERT(jumpSize == DFABytecodeJumpSize::Int32 || jumpSize == DFABytecodeJumpSize::Int16 || jumpSize == DFABytecodeJumpSize::Int8);
</del><ins>+ ASSERT(jumpSize == DFABytecodeJumpSize::Int32 || jumpSize == DFABytecodeJumpSize::Int24 || jumpSize == DFABytecodeJumpSize::Int16 || jumpSize == DFABytecodeJumpSize::Int8);
</ins><span class="cx"> return jumpSize;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,6 +77,8 @@
</span><span class="cx"> return getBits<int8_t>(bytecode, bytecodeLength, index);
</span><span class="cx"> case Int16:
</span><span class="cx"> return getBits<int16_t>(bytecode, bytecodeLength, index);
</span><ins>+ case Int24:
+ return getBits<uint16_t>(bytecode, bytecodeLength, index) | (static_cast<int32_t>(getBits<int8_t>(bytecode, bytecodeLength, index + sizeof(uint16_t))) << 16);
</ins><span class="cx"> case Int32:
</span><span class="cx"> return getBits<int32_t>(bytecode, bytecodeLength, index);
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebKit2/ChangeLog        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-09 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Add 3 byte jump size.
+ https://bugs.webkit.org/show_bug.cgi?id=146425
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/APIUserContentExtensionStore.h:
+ Increment CurrentContentExtensionFileVersion because of change in the bytecode.
+
</ins><span class="cx"> 2015-07-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> SafariViewController loads partial webpage or entirely blank webpage
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h (186648 => 186649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h        2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h        2015-07-09 23:33:25 UTC (rev 186649)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> // This should be incremented every time a functional change is made to the bytecode, file format, etc.
</span><span class="cx"> // to prevent crashing while loading old data.
</span><del>- const static uint32_t CurrentContentExtensionFileVersion = 4;
</del><ins>+ const static uint32_t CurrentContentExtensionFileVersion = 5;
</ins><span class="cx">
</span><span class="cx"> static UserContentExtensionStore& defaultStore();
</span><span class="cx"> static Ref<UserContentExtensionStore> storeWithPath(const WTF::String& storePath);
</span></span></pre>
</div>
</div>
</body>
</html>