Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Issue 2724673002: [WIP] Introduce ScriptResourceData
Patch Set: Fix Created 3 years, 7 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 window_proxy_manager_->ClearForClose(); 76 window_proxy_manager_->ClearForClose();
77 MainThreadDebugger::Instance()->DidClearContextsForFrame(GetFrame()); 77 MainThreadDebugger::Instance()->DidClearContextsForFrame(GetFrame());
78 } 78 }
79 79
80 void ScriptController::UpdateSecurityOrigin(SecurityOrigin* security_origin) { 80 void ScriptController::UpdateSecurityOrigin(SecurityOrigin* security_origin) {
81 window_proxy_manager_->UpdateSecurityOrigin(security_origin); 81 window_proxy_manager_->UpdateSecurityOrigin(security_origin);
82 } 82 }
83 83
84 namespace { 84 namespace {
85 85
86 V8CacheOptions CacheOptions(const ScriptResource* resource, 86 V8CacheOptions CacheOptions(const ScriptResourceData* resource,
87 const Settings* settings) { 87 const Settings* settings) {
88 V8CacheOptions v8_cache_options(kV8CacheOptionsDefault); 88 V8CacheOptions v8_cache_options(kV8CacheOptionsDefault);
89 if (settings) 89 if (settings)
90 v8_cache_options = settings->GetV8CacheOptions(); 90 v8_cache_options = settings->GetV8CacheOptions();
91 if (resource && !resource->GetResponse().CacheStorageCacheName().IsNull()) { 91 if (resource && !resource->GetResponse().CacheStorageCacheName().IsNull()) {
92 switch (settings->GetV8CacheStrategiesForCacheStorage()) { 92 switch (settings->GetV8CacheStrategiesForCacheStorage()) {
93 case V8CacheStrategiesForCacheStorage::kNone: 93 case V8CacheStrategiesForCacheStorage::kNone:
94 v8_cache_options = kV8CacheOptionsNone; 94 v8_cache_options = kV8CacheOptionsNone;
95 break; 95 break;
96 case V8CacheStrategiesForCacheStorage::kNormal: 96 case V8CacheStrategiesForCacheStorage::kNormal:
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 for (size_t i = 0; i < result_array->Length(); ++i) { 365 for (size_t i = 0; i < result_array->Length(); ++i) {
366 v8::Local<v8::Value> value; 366 v8::Local<v8::Value> value;
367 if (!result_array->Get(context, i).ToLocal(&value)) 367 if (!result_array->Get(context, i).ToLocal(&value))
368 return; 368 return;
369 results->push_back(value); 369 results->push_back(value);
370 } 370 }
371 } 371 }
372 } 372 }
373 373
374 } // namespace blink 374 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698