1 files changed, 73 insertions, 0 deletions
diff --git a/image/ScriptedNotificationObserver.cpp b/image/ScriptedNotificationObserver.cpp
new file mode 100644
index 0000000000..4797b182c3
--- /dev/null
+++ b/image/ScriptedNotificationObserver.cpp
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ScriptedNotificationObserver.h"
+#include "imgIScriptedNotificationObserver.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsContentUtils.h"  // for nsAutoScriptBlocker
+
+namespace mozilla {
+namespace image {
+
+NS_IMPL_CYCLE_COLLECTION(ScriptedNotificationObserver, mInner)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ScriptedNotificationObserver)
+  NS_INTERFACE_MAP_ENTRY(imgINotificationObserver)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(ScriptedNotificationObserver)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(ScriptedNotificationObserver)
+
+ScriptedNotificationObserver::ScriptedNotificationObserver(
+    imgIScriptedNotificationObserver* aInner)
+    : mInner(aInner) {}
+
+void ScriptedNotificationObserver::Notify(imgIRequest* aRequest, int32_t aType,
+                                          const nsIntRect* /*aUnused*/) {
+  // For now, we block (other) scripts from running to preserve the historical
+  // behavior from when ScriptedNotificationObserver::Notify was called as part
+  // of the observers list in nsImageLoadingContent::Notify. Now each
+  // ScriptedNotificationObserver has its own imgRequestProxy and thus gets
+  // Notify called directly by imagelib.
+  nsAutoScriptBlocker scriptBlocker;
+
+  if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
+    mInner->SizeAvailable(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::FRAME_UPDATE) {
+    mInner->FrameUpdate(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
+    mInner->FrameComplete(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
+    mInner->DecodeComplete(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
+    mInner->LoadComplete(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::DISCARD) {
+    mInner->Discard(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::IS_ANIMATED) {
+    mInner->IsAnimated(aRequest);
+    return;
+  }
+  if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
+    mInner->HasTransparency(aRequest);
+    return;
+  }
+}
+
+}  // namespace image
+}  // namespace mozilla