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

Unified Diff: content/renderer/java/gin_java_bridge_dispatcher.cc

Issue 323403007: [Android] Java Bridge with Gin: implement Java bound object (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 6 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
« no previous file with comments | « content/renderer/java/gin_java_bridge_dispatcher.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/java/gin_java_bridge_dispatcher.cc
diff --git a/content/renderer/java/gin_java_bridge_dispatcher.cc b/content/renderer/java/gin_java_bridge_dispatcher.cc
index bacc23cc9bde03bcca19846243c302bd4c1d81ab..88d502e5ca48f316e245e431436d2e110348d1b0 100644
--- a/content/renderer/java/gin_java_bridge_dispatcher.cc
+++ b/content/renderer/java/gin_java_bridge_dispatcher.cc
@@ -15,7 +15,8 @@
namespace content {
GinJavaBridgeDispatcher::GinJavaBridgeDispatcher(RenderFrame* render_frame)
- : RenderFrameObserver(render_frame) {
+ : RenderFrameObserver(render_frame),
+ inside_did_clear_window_object_(false) {
}
GinJavaBridgeDispatcher::~GinJavaBridgeDispatcher() {
@@ -31,7 +32,32 @@ bool GinJavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) {
return handled;
}
+namespace {
+
+class ScopedFlag {
+ public:
+ ScopedFlag(bool* flag) : flag_(flag) {
+ DCHECK(!*flag_);
+ *flag_ = true;
+ }
+ ~ScopedFlag() {
+ DCHECK(*flag_);
+ *flag_ = false;
+ }
+ private:
+ bool* flag_;
+
+ DISALLOW_COPY_AND_ASSIGN(ScopedFlag);
+};
+
+} // namespace
+
void GinJavaBridgeDispatcher::DidClearWindowObject() {
+ // Accessing window object when adding properties to it may trigger
+ // a nested call to DidClearWindowObject.
+ if (inside_did_clear_window_object_)
+ return;
+ ScopedFlag flag(&inside_did_clear_window_object_);
for (NamedObjectMap::const_iterator iter = named_objects_.begin();
iter != named_objects_.end(); ++iter) {
// Always create a new GinJavaBridgeObject, so we don't pull any of the V8
« no previous file with comments | « content/renderer/java/gin_java_bridge_dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698