Delivery logic for Object.observe

src/v8.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 20 matching lines @@
 #include "isolate.h"
 #include "elements.h"
 #include "bootstrapper.h"
 #include "debug.h"
 #include "deoptimizer.h"
 #include "frames.h"
 #include "heap-profiler.h"
 #include "hydrogen.h"
 #include "lithium-allocator.h"
 #include "log.h"
+#include "objects.h"
 #include "once.h"
 #include "platform.h"
 #include "runtime-profiler.h"
 #include "serialize.h"
 #include "store-buffer.h"
 
 namespace v8 {
 namespace internal {
 
 V8_DECLARE_ONCE(init_once);
@@ skipping 158 matching lines @@
   if (call_completed_callbacks_ == NULL) return;
   for (int i = 0; i < call_completed_callbacks_->length(); i++) {
     if (callback == call_completed_callbacks_->at(i)) {
       call_completed_callbacks_->Remove(i);
     }
   }
 }
 
 
 void V8::FireCallCompletedCallback(Isolate* isolate) {
-  if (call_completed_callbacks_ == NULL) return;
+  bool has_call_completed_callbacks = call_completed_callbacks_ != NULL;
+  bool has_active_object_observers = isolate->has_active_object_observers();
+  if (!has_call_completed_callbacks && !has_active_object_observers) return;
   HandleScopeImplementer* handle_scope_implementer =
       isolate->handle_scope_implementer();
   if (!handle_scope_implementer->CallDepthIsZero()) return;
   // Fire callbacks.  Increase call depth to prevent recursive callbacks.
   handle_scope_implementer->IncrementCallDepth();
-  for (int i = 0; i < call_completed_callbacks_->length(); i++) {
-    call_completed_callbacks_->at(i)();
+  if (has_active_object_observers) {

[rossberg, 2012/11/06 16:45:57]

FLAG_harmony_observation && ...

[adamk, 2012/11/06 17:00:09]

Done.

+    JSObject::DeliverChangeRecords(isolate);
+  }
+  if (has_call_completed_callbacks) {
+    for (int i = 0; i < call_completed_callbacks_->length(); i++) {
+      call_completed_callbacks_->at(i)();
+    }
   }
   handle_scope_implementer->DecrementCallDepth();
 }
 
 
 // Use a union type to avoid type-aliasing optimizations in GCC.
 typedef union {
   double double_value;
   uint64_t uint64_t_value;
 } double_int_union;
@@ skipping 45 matching lines @@
   SetUpJSCallerSavedCodeData();
   SamplerRegistry::SetUp();
   ExternalReference::SetUp();
 }
 
 void V8::InitializeOncePerProcess() {
   CallOnce(&init_once, &InitializeOncePerProcessImpl);
 }
 
 } }  // namespace v8::internal