Commit 97cbcff0 authored by dpapad's avatar dpapad Committed by Commit Bot

Explicitly mark IDR_SERVICE_WORKER_BINDINGS_JS with compress="false".

Reverting previous change to allow compressing this file, since
failures on ASAN and Win10 are apparently still happening, when
attempting to compress this file.

This is one of many CLs, in preparation of compressing all HTML, JS,
CSS, SVG files by default (meaning without requiring compress="gzip"
to be specified).

Bug: 1068407
Change-Id: I91fe5e5444f3b6cbe170f83b0fef8f8a0d29886b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153749Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759842}
parent 717b5661
......@@ -17,7 +17,6 @@
#include "base/feature_list.h"
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted_memory.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
......@@ -497,11 +496,9 @@ void Dispatcher::WillEvaluateServiceWorkerOnWorkerThread(
v8::Isolate* isolate = context->isolate();
// Fetch the source code for service_worker_bindings.js.
scoped_refptr<base::RefCountedMemory> bytes =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
base::StringPiece script_resource =
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_SERVICE_WORKER_BINDINGS_JS);
base::StringPiece script_resource(
reinterpret_cast<const char*>(bytes->front()), bytes->size());
v8::Local<v8::String> script =
v8::String::NewExternalOneByte(
isolate, new StaticV8ExternalOneByteStringResource(script_resource))
......
......@@ -64,7 +64,7 @@
<include name="IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS" file="mojo_private_custom_bindings.js" type="BINDATA" />
<include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="permissions_custom_bindings.js" type="BINDATA" />
<include name="IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS" file="printer_provider_custom_bindings.js" type="BINDATA" />
<include name="IDR_SERVICE_WORKER_BINDINGS_JS" file="service_worker_bindings.js" type="BINDATA" />
<include name="IDR_SERVICE_WORKER_BINDINGS_JS" file="service_worker_bindings.js" compress="false" type="BINDATA" />
<include name="IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS" file="web_request_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEB_REQUEST_EVENT_JS" file="web_request_event.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS" file="guest_view/web_view/web_view_request_custom_bindings.js" type="BINDATA" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment