diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc b/chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc index 12104ab2a26..adee1ee25f7 100644 --- a/chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc +++ b/chromium/third_party/blink/renderer/platform/bindings/v8_dom_wrapper.cc @@ -94,10 +94,11 @@ bool V8DOMWrapper::HasInternalFieldsSet(v8::Local<v8::Value> value) { if (object->InternalFieldCount() < kV8DefaultWrapperInternalFieldCount) return false; - const ScriptWrappable* untrusted_script_wrappable = ToScriptWrappable(object); + // The untyped wrappable can either be ScriptWrappable or CustomWrappable. + const void* untrused_wrappable = ToUntypedWrappable(object); const WrapperTypeInfo* untrusted_wrapper_type_info = ToWrapperTypeInfo(object); - return untrusted_script_wrappable && untrusted_wrapper_type_info && + return untrused_wrappable && untrusted_wrapper_type_info && untrusted_wrapper_type_info->gin_embedder == gin::kEmbedderBlink; } |