Merge 107170 - DOM mutations should not be delivered on worker threads

Source/WebCore/dom/WebKitMutationObserver.cpp

 /*
  * Copyright (C) 2011 Google Inc. 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
@@ skipping 23 matching lines @@
 
 #include "WebKitMutationObserver.h"
 
 #include "Document.h"
 #include "ExceptionCode.h"
 #include "MutationCallback.h"
 #include "MutationObserverRegistration.h"
 #include "MutationRecord.h"
 #include "Node.h"
 #include <wtf/ListHashSet.h>
+#include <wtf/MainThread.h>
 
 namespace WebCore {
 
 PassRefPtr<WebKitMutationObserver> WebKitMutationObserver::create(PassRefPtr<MutationCallback> callback)
 {
     return adoptRef(new WebKitMutationObserver(callback));
 }
 
 WebKitMutationObserver::WebKitMutationObserver(PassRefPtr<MutationCallback> callback)
     : m_callback(callback)
@@ skipping 54 matching lines @@
 typedef ListHashSet<RefPtr<WebKitMutationObserver> > MutationObserverSet;
 
 static MutationObserverSet& activeMutationObservers()
 {
     DEFINE_STATIC_LOCAL(MutationObserverSet, activeObservers, ());
     return activeObservers;
 }
 
 void WebKitMutationObserver::enqueueMutationRecord(PassRefPtr<MutationRecord> mutation)
 {
+    ASSERT(isMainThread());
     m_records.append(mutation);
     activeMutationObservers().add(this);
 }
 
 void WebKitMutationObserver::deliver()
 {
     MutationRecordArray records;
     records.swap(m_records);
 
     for (HashSet<MutationObserverRegistration*>::iterator iter = m_registrations.begin(); iter != m_registrations.end(); ++iter)
         (*iter)->clearTransientRegistrations();
 
     m_callback->handleEvent(&records, this);
 }
 
 void WebKitMutationObserver::deliverAllMutations()
 {
+    ASSERT(isMainThread());
     static bool deliveryInProgress = false;
     if (deliveryInProgress)
         return;
     deliveryInProgress = true;
 
     while (!activeMutationObservers().isEmpty()) {
         MutationObserverSet::iterator iter = activeMutationObservers().begin();
         RefPtr<WebKitMutationObserver> observer = *iter;
         activeMutationObservers().remove(iter);
         observer->deliver();
     }
 
     deliveryInProgress = false;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MUTATION_OBSERVERS)