Revert "Optionally compress V8 code cache data with snappy."

This reverts commit dd138e54138a00f80fa1547bb3b4922aa02ad335, aka r185305.

Speculative revert to fix Android AOSP build breakage: http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/builds/33131/steps/compile/logs/stdio.

TBR=yangguo,jochen@chromium.org,vogelheim
BUG=

Review URL: https://codereview.chromium.org/721373002

git-svn-id: svn://svn.chromium.org/blink/trunk@185314 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/bindings/core/DEPS

@@ -7,7 +7,6 @@ include_rules = [
     "-modules",
     "+platform",
     "+public/platform",
-    "+third_party/snappy",
     "-web",
 
     # TODO(tasak): Get this list to zero.

third_party/WebKit/Source/bindings/core/v8/ScriptStreamer.cpp

@@ -545,7 +545,7 @@ bool ScriptStreamer::startStreamingInternal(PendingScript& script, Settings* set
     // default, we generate the parser cache for streamed scripts, to emulate
     // the non-streaming behavior (see V8ScriptRunner::compileScript).
     v8::ScriptCompiler::CompileOptions compileOption = v8::ScriptCompiler::kProduceParserCache;
-    if (settings->v8CacheOptions() == V8CacheOptionsCode || settings->v8CacheOptions() == V8CacheOptionsCodeCompressed)
+    if (settings->v8CacheOptions() == V8CacheOptionsCode)
         compileOption = v8::ScriptCompiler::kProduceCodeCache;
 
     // The Resource might go out of scope if the script is no longer

third_party/WebKit/Source/bindings/core/v8/V8CacheOptions.h

@@ -36,8 +36,7 @@ namespace blink {
 enum V8CacheOptions {
     V8CacheOptionsOff,
     V8CacheOptionsParse,
-    V8CacheOptionsCode,
-    V8CacheOptionsCodeCompressed
+    V8CacheOptionsCode
 };
 
 } // namespace blink

third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp

@@ -37,7 +37,6 @@
 #include "core/fetch/ScriptResource.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
-#include "third_party/snappy/src/snappy.h"
 
 namespace blink {
 
@@ -65,49 +64,29 @@ v8::Local<v8::Value> throwStackOverflowExceptionIfNeeded(v8::Isolate* isolate)
     return result;
 }
 
-void writeToCache(ScriptResource* resource, unsigned cacheTag, Resource::MetadataCacheType cacheType, const v8::ScriptCompiler::CachedData* cachedData, bool compressed)
+v8::Local<v8::Script> compileAndProduceCache(v8::Isolate* isolate, v8::Handle<v8::String> code, v8::ScriptOrigin origin, ScriptResource* resource, v8::ScriptCompiler::CompileOptions options, unsigned cacheTag, Resource::MetadataCacheType cacheType)
 {
-    const char* data = reinterpret_cast<const char*>(cachedData->data);
-    int length = cachedData->length;
-    std::string compressedOutput;
-    if (compressed) {
-        snappy::Compress(data, length, &compressedOutput);
-        data = compressedOutput.data();
-        length = compressedOutput.length();
-    }
+    v8::ScriptCompiler::Source source(code, origin);
+    v8::Local<v8::Script> script = v8::ScriptCompiler::Compile(isolate, &source, options);
+    const v8::ScriptCompiler::CachedData* cachedData = source.GetCachedData();
+    if (resource && cachedData) {
         resource->clearCachedMetadata();
         resource->setCachedMetadata(
             cacheTag,
-        data,
-        length,
+            reinterpret_cast<const char*>(cachedData->data),
+            cachedData->length,
             cacheType);
-}
-
-v8::Local<v8::Script> compileAndProduceCache(v8::Isolate* isolate, v8::Handle<v8::String> code, v8::ScriptOrigin origin, ScriptResource* resource, v8::ScriptCompiler::CompileOptions options, unsigned cacheTag, Resource::MetadataCacheType cacheType, bool compressed)
-{
-    v8::ScriptCompiler::Source source(code, origin);
-    v8::Local<v8::Script> script = v8::ScriptCompiler::Compile(isolate, &source, options);
-    const v8::ScriptCompiler::CachedData* cachedData = source.GetCachedData();
-    if (resource && cachedData)
-        writeToCache(resource, cacheTag, cacheType, cachedData, compressed);
+    }
     return script;
 }
 
-v8::Local<v8::Script> compileAndConsumeCache(v8::Isolate* isolate, v8::Handle<v8::String> code, v8::ScriptOrigin origin, ScriptResource* resource, v8::ScriptCompiler::CompileOptions options, unsigned cacheTag, bool compressed)
+v8::Local<v8::Script> compileAndConsumeCache(v8::Isolate* isolate, v8::Handle<v8::String> code, v8::ScriptOrigin origin, ScriptResource* resource, v8::ScriptCompiler::CompileOptions options, unsigned cacheTag)
 {
     // Consume existing cache data:
     CachedMetadata* cachedMetadata = resource->cachedMetadata(cacheTag);
-    const char* data = cachedMetadata->data();
-    int length = cachedMetadata->size();
-    std::string uncompressedOutput;
-    if (compressed) {
-        snappy::Uncompress(data, length, &uncompressedOutput);
-        data = uncompressedOutput.data();
-        length = uncompressedOutput.length();
-    }
     v8::ScriptCompiler::CachedData* cachedData = new v8::ScriptCompiler::CachedData(
-        reinterpret_cast<const uint8_t*>(data),
-        length,
+        reinterpret_cast<const uint8_t*>(cachedMetadata->data()),
+        cachedMetadata->size(),
         v8::ScriptCompiler::CachedData::BufferNotOwned);
     v8::ScriptCompiler::Source source(code, origin, cachedData);
     return v8::ScriptCompiler::Compile(isolate, &source, options);
@@ -135,7 +114,6 @@ v8::Local<v8::Script> V8ScriptRunner::compileScript(v8::Handle<v8::String> code,
 
     v8::Local<v8::Script> script;
     unsigned cacheTag = 0;
-    bool compressed = cacheOptions == V8CacheOptionsCodeCompressed;
     if (streamer) {
         // We don't stream scripts which don't have a Resource.
         ASSERT(resource);
@@ -148,38 +126,37 @@ v8::Local<v8::Script> V8ScriptRunner::compileScript(v8::Handle<v8::String> code,
         // streamer is started. Here we only need to get the data out.
         const v8::ScriptCompiler::CachedData* newCachedData = streamer->source()->GetCachedData();
         if (newCachedData) {
-            // TODO(yangguo,vogelheim): code cache should use Resource::SendToPlatform.
-            writeToCache(resource, streamer->cachedDataType(), Resource::CacheLocally, newCachedData, compressed);
+            resource->clearCachedMetadata();
+            resource->setCachedMetadata(streamer->cachedDataType(), reinterpret_cast<const char*>(newCachedData->data), newCachedData->length, Resource::CacheLocally);
         }
     } else if (!resource || !resource->url().protocolIsInHTTPFamily() || code->Length() < 1024) {
         v8::ScriptCompiler::Source source(code, origin);
         script = v8::ScriptCompiler::Compile(isolate, &source, v8::ScriptCompiler::kNoCompileOptions);
     } else {
-        Resource::MetadataCacheType cacheType = Resource::CacheLocally;
-        v8::ScriptCompiler::CompileOptions consumeOption = v8::ScriptCompiler::kConsumeParserCache;
-        v8::ScriptCompiler::CompileOptions produceOption = v8::ScriptCompiler::kProduceParserCache;
         switch (cacheOptions) {
-        case V8CacheOptionsOff:
-            // Use default.
-            cacheTag = tagForParserCache();
-            break;
         case V8CacheOptionsParse:
             cacheTag = tagForParserCache();
-            cacheType = Resource::SendToPlatform;
-            consumeOption = v8::ScriptCompiler::kConsumeParserCache;
-            produceOption = v8::ScriptCompiler::kProduceParserCache;
+            script = resource->cachedMetadata(cacheTag)
+                ? compileAndConsumeCache(isolate, code, origin, resource, v8::ScriptCompiler::kConsumeParserCache, cacheTag)
+                : compileAndProduceCache(isolate, code, origin, resource, v8::ScriptCompiler::kProduceParserCache, cacheTag, Resource::SendToPlatform);
             break;
-        case V8CacheOptionsCodeCompressed:
         case V8CacheOptionsCode:
             cacheTag = tagForCodeCache();
-            cacheType = Resource::SendToPlatform;
-            consumeOption = v8::ScriptCompiler::kConsumeCodeCache;
-            produceOption = v8::ScriptCompiler::kProduceCodeCache;
+            script = resource->cachedMetadata(cacheTag)
+                ? compileAndConsumeCache(isolate, code, origin, resource, v8::ScriptCompiler::kConsumeCodeCache, cacheTag)
+                : compileAndProduceCache(isolate, code, origin, resource, v8::ScriptCompiler::kProduceCodeCache, cacheTag, Resource::SendToPlatform);
             break;
-        }
+        case V8CacheOptionsOff:
+            // Previous behaviour was to always generate an in-memory parser
+            // cache. We emulate this here.
+            // FIXME: Determine whether this should get its own setting, so we
+            //        can also have a true 'off'.
+            cacheTag = tagForParserCache();
             script = resource->cachedMetadata(cacheTag)
-            ? compileAndConsumeCache(isolate, code, origin, resource, consumeOption, cacheTag, compressed)
-            : compileAndProduceCache(isolate, code, origin, resource, produceOption, cacheTag, cacheType, compressed);
+                ? compileAndConsumeCache(isolate, code, origin, resource, v8::ScriptCompiler::kConsumeParserCache, cacheTag)
+                : compileAndProduceCache(isolate, code, origin, resource, v8::ScriptCompiler::kProduceParserCache, cacheTag, Resource::CacheLocally);
+            break;
+        }
     }
     return script;
 }

third_party/WebKit/Source/bindings/core/v8/V8ScriptRunnerTest.cpp

@@ -136,17 +136,6 @@ TEST_F(V8ScriptRunnerTest, codeOptions)
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
     EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache()));
 
-    // FIXME: Code caching is presently still disabled.
-    //        Enable EXPECT when code caching lands.
-    // EXPECT_TRUE(m_resource->cachedMetadata(tagForCodeCache(false)));
-}
-
-TEST_F(V8ScriptRunnerTest, codeCompressedOptions)
-{
-    setResource();
-    EXPECT_TRUE(compileScript(V8CacheOptionsCodeCompressed));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache()));
-
     // FIXME: Code caching is presently still disabled.
     //        Enable EXPECT when code caching lands.
     // EXPECT_TRUE(m_resource->cachedMetadata(tagForCodeCache()));

third_party/WebKit/Source/core/BUILD.gn

@@ -90,7 +90,6 @@ source_set("prerequisites") {
     "//third_party/npapi",
     "//third_party/ots",
     "//third_party/qcms",
-    "//third_party/snappy",
     "//third_party/sqlite",
     "//third_party/zlib",
     "//url",

third_party/WebKit/Source/core/core.gyp

@@ -187,7 +187,6 @@
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
-        '<(DEPTH)/third_party/snappy/snappy.gyp:snappy',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',

third_party/WebKit/Source/web/AssertMatchingEnums.cpp

@@ -639,7 +639,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebSelectionBound::SelectionRight, CompositedSelect
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsOff, V8CacheOptionsOff);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsParse, V8CacheOptionsParse);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsCode, V8CacheOptionsCode);
-COMPILE_ASSERT_MATCHING_ENUM(WebSettings::V8CacheOptionsCodeCompressed, V8CacheOptionsCodeCompressed);
 
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::PointerTypeNone, PointerTypeNone);
 COMPILE_ASSERT_MATCHING_ENUM(WebSettings::PointerTypeCoarse, PointerTypeCoarse);

third_party/WebKit/public/web/WebSettings.h

@@ -55,8 +55,7 @@ public:
     enum V8CacheOptions {
         V8CacheOptionsOff,
         V8CacheOptionsParse,
-        V8CacheOptionsCode,
-        V8CacheOptionsCodeCompressed
+        V8CacheOptionsCode
     };
 
     enum V8ScriptStreamingMode {