Changeset 61405 in webkit

Timestamp:

Jun 18, 2010 8:00:29 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-18 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by David Levin.

Persist V8's ScriptData to the memory cache.
​https://bugs.webkit.org/show_bug.cgi?id=38661

When V8 ScriptData caching was originally submitted it causes crashes
in external scripts with high-byte characters. This new test crashes on
the original code, but now passes.

• fast/js/parser-high-byte-character-expected.txt: Added.
• fast/js/parser-high-byte-character.html: Added.
• fast/js/script-tests/parser-high-byte-character.js: Added. (runTest):

2010-06-18 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by David Levin.

Persist V8's ScriptData to the memory cache.
​https://bugs.webkit.org/show_bug.cgi?id=38661

This stores V8's ScriptData in the memory cache and also causes the
network platform layer to be notified of the available cacheable
metadata.

Chromium's morejs benchmark showed a ~7% improvement when this was
originally submitted (before it had to be rolled back).

Test: fast/js/parser-high-byte-character.html

• bindings/v8/ScriptSourceCode.h: (WebCore::ScriptSourceCode::ScriptSourceCode): (WebCore::ScriptSourceCode::cachedScript):
• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::compileScript): (WebCore::V8Proxy::precompileScript): (WebCore::V8Proxy::evaluate):
• bindings/v8/V8Proxy.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/parser-high-byte-character-expected.txt (added)
• LayoutTests/fast/js/parser-high-byte-character.html (added)
• LayoutTests/fast/js/script-tests/parser-high-byte-character.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/ScriptSourceCode.h (modified) (5 diffs)
• WebCore/bindings/v8/V8Proxy.cpp (modified) (6 diffs)
• WebCore/bindings/v8/V8Proxy.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-18  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by David Levin.
+
+        Persist V8's ScriptData to the memory cache.
+        https://bugs.webkit.org/show_bug.cgi?id=38661
+
+        When V8 ScriptData caching was originally submitted it causes crashes
+        in external scripts with high-byte characters. This new test crashes on
+        the original code, but now passes.
+
+        * fast/js/parser-high-byte-character-expected.txt: Added.
+        * fast/js/parser-high-byte-character.html: Added.
+        * fast/js/script-tests/parser-high-byte-character.js: Added.
+        (runTest):
+
 2010-06-18  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-18  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by David Levin.
+
+        Persist V8's ScriptData to the memory cache.
+        https://bugs.webkit.org/show_bug.cgi?id=38661
+
+        This stores V8's ScriptData in the memory cache and also causes the
+        network platform layer to be notified of the available cacheable
+        metadata.
+
+        Chromium's morejs benchmark showed a ~7% improvement when this was
+        originally submitted (before it had to be rolled back).
+
+        Test: fast/js/parser-high-byte-character.html
+
+        * bindings/v8/ScriptSourceCode.h:
+        (WebCore::ScriptSourceCode::ScriptSourceCode):
+        (WebCore::ScriptSourceCode::cachedScript):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::compileScript):
+        (WebCore::V8Proxy::precompileScript):
+        (WebCore::V8Proxy::evaluate):
+        * bindings/v8/V8Proxy.h:
+
 2010-06-18  Anton Muhin  <antonm@chromium.org>
 

trunk/WebCore/bindings/v8/ScriptSourceCode.h

@@ -32 +32 @@
 #define ScriptSourceCode_h
 
+#include "CachedResourceHandle.h"
 #include "CachedScript.h"
 #include "KURL.h"
@@ -42 +43 @@
     ScriptSourceCode(const String& source, const KURL& url = KURL(), int startLine = 1)
         : m_source(source)
+        , m_cachedScript(0)
         , m_url(url)
         , m_startLine(startLine)
@@ -51 +53 @@
     ScriptSourceCode(CachedScript* cs)
         : m_source(cs->script())
+        , m_cachedScript(cs)
         , m_url(ParsedURLString, cs->url())
         , m_startLine(1)
@@ -59 +62 @@
 
     const String& source() const { return m_source; }
+    CachedScript* cachedScript() const { return m_cachedScript.get(); }
     const KURL& url() const { return m_url; }
     int startLine() const { return m_startLine; }
@@ -64 +68 @@
 private:
     String m_source;
+    CachedResourceHandle<CachedScript> m_cachedScript;
     KURL m_url;
     int m_startLine;

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -33 +33 @@
 
 #include "CSSMutableStyleDeclaration.h"
+#include "CachedMetadata.h"
 #include "DateExtension.h"
 #include "DocumentLoader.h"
@@ -70 +71 @@
 #include <wtf/Assertions.h>
 #include <wtf/OwnArrayPtr.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/StringExtras.h>
@@ -233 +235 @@
 }
 
-v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine)
+v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData)
 {
     const uint16_t* fileNameString = fromWebCoreString(fileName);
@@ -239 +241 @@
     v8::Handle<v8::Integer> line = v8::Integer::New(baseLine);
     v8::ScriptOrigin origin(name, line);
-    v8::Handle<v8::Script> script = v8::Script::Compile(code, &origin);
+    v8::Handle<v8::Script> script = v8::Script::Compile(code, &origin, scriptData);
     return script;
 }
@@ -338 +340 @@
 }
 
+PassOwnPtr<v8::ScriptData> V8Proxy::precompileScript(v8::Handle<v8::String> code, CachedScript* cachedScript)
+{
+    // A pseudo-randomly chosen ID used to store and retrieve V8 ScriptData from
+    // the CachedScript. If the format changes, this ID should be changed too.
+    static const unsigned dataTypeID = 0xECC13BD7;
+
+    // Very small scripts are not worth the effort to preparse.
+    static const unsigned minPreparseLength = 1024;
+
+    if (!cachedScript || code->Length() < minPreparseLength)
+        return 0;
+
+    CachedMetadata* cachedMetadata = cachedScript->cachedMetadata(dataTypeID);
+    if (cachedMetadata)
+        return v8::ScriptData::New(cachedMetadata->data(), cachedMetadata->size());
+
+    OwnPtr<v8::ScriptData> scriptData(v8::ScriptData::PreCompile(code));
+    cachedScript->setCachedMetadata(dataTypeID, scriptData->Data(), scriptData->Length());
+
+    return scriptData.release();
+}
+
 v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* node)
 {
@@ -363 +387 @@
         PlatformBridge::traceEventBegin("v8.compile", node, "");
 #endif
+        OwnPtr<v8::ScriptData> scriptData = precompileScript(code, source.cachedScript());
 
         // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at
         // 1, whereas v8 starts at 0.
-        v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1);
+        v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1, scriptData.get());
 #if PLATFORM(CHROMIUM)
         PlatformBridge::traceEventEnd("v8.compile", node, "");

trunk/WebCore/bindings/v8/V8Proxy.h

@@ -54 +54 @@
 namespace WebCore {
 
+    class CachedScript;
     class DOMWindow;
     class Frame;
@@ -286 +287 @@
         static v8::Handle<v8::Value> checkNewLegal(const v8::Arguments&);
 
-        static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine);
+        static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* = 0);
 
         // If the exception code is different from zero, a DOM exception is
@@ -342 +343 @@
         void resetIsolatedWorlds();
 
+        PassOwnPtr<v8::ScriptData> precompileScript(v8::Handle<v8::String>, CachedScript*);
+
         // Returns false when we're out of memory in V8.
         bool setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetContext);