bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision ad51088c (#444943)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-01-23 12:36:54 -05:00
parent 9d48a4f80e
commit b7b145fa4f
117 changed files with 1261 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcef/renderer/webkit_glue.cc
View File

@@ -33,6 +33,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "third_party/WebKit/Source/core/editing/serializers/Serialization.h"
#include "third_party/WebKit/Source/core/frame/LocalFrame.h"
#include "third_party/WebKit/Source/core/frame/Settings.h"
#include "third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h"
#include "third_party/WebKit/Source/web/WebLocalFrameImpl.h"
#include "third_party/WebKit/Source/web/WebViewImpl.h"
MSVC_POP_WARNING();
@@ -221,7 +222,7 @@ v8::MaybeLocal<v8::Value> ExecuteV8ScriptAndReturnValue(
if (frame) {
blink::V8CacheOptions v8CacheOptions(blink::V8CacheOptionsDefault);
if (frame && frame->settings())
v8CacheOptions = frame->settings()->v8CacheOptions();
v8CacheOptions = frame->settings()->getV8CacheOptions();
v8::Local<v8::Script> script;
if (!blink::v8Call(blink::V8ScriptRunner::compileScript(ssc, isolate,
@@ -240,4 +241,16 @@ bool IsScriptForbidden() {
return blink::ScriptForbiddenScope::isScriptForbidden();
}
void registerURLSchemeAsLocal(const blink::WebString& scheme) {
blink::SchemeRegistry::registerURLSchemeAsLocal(scheme);
}
void registerURLSchemeAsSecure(const blink::WebString& scheme) {
blink::SchemeRegistry::registerURLSchemeAsSecure(scheme);
}
void registerURLSchemeAsCORSEnabled(const blink::WebString& scheme) {
blink::SchemeRegistry::registerURLSchemeAsCORSEnabled(scheme);
}
} // webkit_glue