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

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

Issue 2724673002: [WIP] Introduce ScriptResourceData
Patch Set: Compile fix Created 3 years, 4 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/bindings/core/v8/ScriptSourceCode.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 window_proxy_manager_->ClearForClose(); 77 window_proxy_manager_->ClearForClose();
78 MainThreadDebugger::Instance()->DidClearContextsForFrame(GetFrame()); 78 MainThreadDebugger::Instance()->DidClearContextsForFrame(GetFrame());
79 } 79 }
80 80
81 void ScriptController::UpdateSecurityOrigin(SecurityOrigin* security_origin) { 81 void ScriptController::UpdateSecurityOrigin(SecurityOrigin* security_origin) {
82 window_proxy_manager_->UpdateSecurityOrigin(security_origin); 82 window_proxy_manager_->UpdateSecurityOrigin(security_origin);
83 } 83 }
84 84
85 namespace { 85 namespace {
86 86
87 V8CacheOptions CacheOptions(const ScriptResource* resource, 87 V8CacheOptions CacheOptions(const ScriptResourceData* resource,
88 const Settings* settings) { 88 const Settings* settings) {
89 V8CacheOptions v8_cache_options(kV8CacheOptionsDefault); 89 V8CacheOptions v8_cache_options(kV8CacheOptionsDefault);
90 if (settings) 90 if (settings)
91 v8_cache_options = settings->GetV8CacheOptions(); 91 v8_cache_options = settings->GetV8CacheOptions();
92 if (resource && !resource->GetResponse().CacheStorageCacheName().IsNull()) { 92 if (resource && !resource->GetResponse().CacheStorageCacheName().IsNull()) {
93 switch (settings->GetV8CacheStrategiesForCacheStorage()) { 93 switch (settings->GetV8CacheStrategiesForCacheStorage()) {
94 case V8CacheStrategiesForCacheStorage::kNone: 94 case V8CacheStrategiesForCacheStorage::kNone:
95 v8_cache_options = kV8CacheOptionsNone; 95 v8_cache_options = kV8CacheOptionsNone;
96 break; 96 break;
97 case V8CacheStrategiesForCacheStorage::kNormal: 97 case V8CacheStrategiesForCacheStorage::kNormal:
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kDefault, 380 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kDefault,
381 V8CacheStrategiesForCacheStorage::kDefault); 381 V8CacheStrategiesForCacheStorage::kDefault);
382 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kNone, 382 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kNone,
383 V8CacheStrategiesForCacheStorage::kNone); 383 V8CacheStrategiesForCacheStorage::kNone);
384 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kNormal, 384 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kNormal,
385 V8CacheStrategiesForCacheStorage::kNormal); 385 V8CacheStrategiesForCacheStorage::kNormal);
386 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kAggressive, 386 STATIC_ASSERT_ENUM(WebSettings::V8CacheStrategiesForCacheStorage::kAggressive,
387 V8CacheStrategiesForCacheStorage::kAggressive); 387 V8CacheStrategiesForCacheStorage::kAggressive);
388 388
389 } // namespace blink 389 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/bindings/core/v8/ScriptSourceCode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698