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

Unified Diff: gin/per_context_data.cc

Issue 60613003: Add a dependency from Gin to base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « gin/per_context_data.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gin/per_context_data.cc
diff --git a/gin/per_context_data.cc b/gin/per_context_data.cc
index 8f6261ac4a395868c46fe5f53740b243a18e758a..58a72418177cf58db930efea13c0e8c0f004a619 100644
--- a/gin/per_context_data.cc
+++ b/gin/per_context_data.cc
@@ -4,7 +4,7 @@
#include "gin/per_context_data.h"
-#include <assert.h>
+#include "base/logging.h"
#include "gin/wrapper_info.h"
namespace gin {
@@ -20,11 +20,11 @@ PerContextData::PerContextData(v8::Handle<v8::Context> context) {
}
PerContextData::~PerContextData() {
- assert(supplements_.empty());
+ DCHECK(supplements_.empty());
}
void PerContextData::Detach(v8::Handle<v8::Context> context) {
- assert(From(context) == this);
+ DCHECK(From(context) == this);
context->SetAlignedPointerInEmbedderData(kEncodedValueIndex, NULL);
SuplementVector supplements;
@@ -33,7 +33,6 @@ void PerContextData::Detach(v8::Handle<v8::Context> context) {
for (SuplementVector::iterator it = supplements.begin();
it != supplements.end(); ++it) {
(*it)->Detach(context);
- delete *it;
}
}
@@ -42,8 +41,8 @@ PerContextData* PerContextData::From(v8::Handle<v8::Context> context) {
context->GetAlignedPointerFromEmbedderData(kEncodedValueIndex));
}
-void PerContextData::AddSupplement(ContextSupplement* supplement) {
- supplements_.push_back(supplement);
+void PerContextData::AddSupplement(scoped_ptr<ContextSupplement> supplement) {
+ supplements_.push_back(supplement.release());
}
} // namespace gin
« no previous file with comments | « gin/per_context_data.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698