| Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| index f6d5d7586ecf06a6c36dad021dd0f9129e5f4b9e..06a5596ac028b23742d96cdead1798f899c4d98e 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
|
| @@ -107,10 +107,10 @@ v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(
|
| {
|
| V8CacheOptions v8CacheOptions(V8CacheOptionsDefault);
|
| if (frame()->settings())
|
| - v8CacheOptions = frame()->settings()->v8CacheOptions();
|
| + v8CacheOptions = frame()->settings()->GetV8CacheOptions();
|
| if (source.resource() &&
|
| !source.resource()->response().cacheStorageCacheName().isNull()) {
|
| - switch (frame()->settings()->v8CacheStrategiesForCacheStorage()) {
|
| + switch (frame()->settings()->GetV8CacheStrategiesForCacheStorage()) {
|
| case V8CacheStrategiesForCacheStorage::None:
|
| v8CacheOptions = V8CacheOptionsNone;
|
| break;
|
| @@ -293,7 +293,7 @@ bool ScriptController::canExecuteScripts(
|
| return false;
|
| Settings* settings = frame()->settings();
|
| const bool allowed =
|
| - client->allowScript(settings && settings->scriptEnabled());
|
| + client->allowScript(settings && settings->GetScriptEnabled());
|
| if (!allowed && reason == AboutToExecuteScript)
|
| client->didNotAllowScript();
|
| return allowed;
|
|
|