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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp b/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
index 389756e6f31c8b9fc6c3dfe3dbbadb506d87786e..71fddaffd08549c83ef34e86cdd31e7cf03dc327 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
@@ -31,7 +31,6 @@
#include "bindings/core/v8/V8GCController.h"
#include "bindings/core/v8/ActiveScriptWrappable.h"
-#include "bindings/core/v8/NPV8Object.h"
#include "bindings/core/v8/RetainedDOMInfo.h"
#include "bindings/core/v8/V8AbstractEventListener.h"
#include "bindings/core/v8/V8Binding.h"
@@ -119,8 +118,7 @@ public:
v8::Local<v8::Object> wrapper = v8::Local<v8::Object>::New(m_isolate, v8::Persistent<v8::Object>::Cast(*value));
ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
- const WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
- if (type != npObjectTypeInfo() && type->hasPendingActivity(wrapper)) {
+ if (toWrapperTypeInfo(wrapper)->hasPendingActivity(wrapper)) {
v8::Persistent<v8::Object>::Cast(*value).MarkActive();
return;
}
@@ -165,7 +163,7 @@ public:
ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
const WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
- if (type != npObjectTypeInfo() && type->hasPendingActivity(wrapper)) {
+ if (type->hasPendingActivity(wrapper)) {
// If you hit this assert, you'll need to add a [DependentiLifetime]
// extended attribute to the DOM interface. A DOM interface that
// overrides hasPendingActivity must be marked as [DependentiLifetime].
@@ -456,10 +454,8 @@ public:
v8::Local<v8::Object> wrapper = v8::Local<v8::Object>::New(m_isolate, v8::Persistent<v8::Object>::Cast(*value));
ASSERT(V8DOMWrapper::hasInternalFieldsSet(wrapper));
- const WrapperTypeInfo* type = toWrapperTypeInfo(wrapper);
// The ExecutionContext check is heavy, so it should be done at the last.
- if (type != npObjectTypeInfo()
- && type->hasPendingActivity(wrapper)
+ if (toWrapperTypeInfo(wrapper)->hasPendingActivity(wrapper)
// TODO(haraken): Currently we don't have a way to get a creation
// context from a wrapper. We should implement the way and enable
// the following condition.

Powered by Google App Engine
This is Rietveld 408576698