content/child/service_worker/service_worker_dispatcher.cc - Issue 1497743005: Allow huge data: URIs only via WebView.loadDataWithBaseUrl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/service_worker/service_worker_dispatcher.cc

Issue 1497743005: Allow huge data: URIs only via WebView.loadDataWithBaseUrl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sort out the tests Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigation_entry_impl.h ('K') | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/common/common_param_traits_unittest.cc » ('j') | content/common/navigation_params.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/service_worker/service_worker_dispatcher.cc

diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc

index 832395a29fe1b32faff2df56a81a52ebb709bcb4..f6b180062213bb6c71312db839654c5110713c55 100644

--- a/content/child/service_worker/service_worker_dispatcher.cc

+++ b/content/child/service_worker/service_worker_dispatcher.cc

@@ -19,7 +19,7 @@

#include "content/child/webmessageportchannel_impl.h"

#include "content/common/service_worker/service_worker_messages.h"

#include "content/common/service_worker/service_worker_types.h"

-#include "content/public/common/url_utils.h"

+#include "content/public/common/content_constants.h"

#include "third_party/WebKit/public/platform/WebString.h"

#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"

@@ -107,8 +107,8 @@ void ServiceWorkerDispatcher::RegisterServiceWorker(

WebServiceWorkerRegistrationCallbacks* callbacks) {

DCHECK(callbacks);

- if (pattern.possibly_invalid_spec().size() > GetMaxURLChars() ||

- script_url.possibly_invalid_spec().size() > GetMaxURLChars()) {

+ if (pattern.possibly_invalid_spec().size() > kMaxURLChars ||

+ script_url.possibly_invalid_spec().size() > kMaxURLChars) {

scoped_ptr<WebServiceWorkerRegistrationCallbacks>

owned_callbacks(callbacks);

std::string error_message(kServiceWorkerRegisterErrorPrefix);

@@ -158,7 +158,7 @@ void ServiceWorkerDispatcher::GetRegistration(

WebServiceWorkerGetRegistrationCallbacks* callbacks) {

DCHECK(callbacks);

- if (document_url.possibly_invalid_spec().size() > GetMaxURLChars()) {

+ if (document_url.possibly_invalid_spec().size() > kMaxURLChars) {

scoped_ptr<WebServiceWorkerGetRegistrationCallbacks> owned_callbacks(

callbacks);

std::string error_message(kServiceWorkerGetRegistrationErrorPrefix);