Merge 70550

WebCore/inspector/InspectorDOMStorageResource.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 82 matching lines @@
     ASSERT(m_frontend);
     if (!m_reportingChangesToFrontend) {
         m_frame->domWindow()->addEventListener(eventNames().storageEvent, this, true);
         m_reportingChangesToFrontend = true;
     }
 }
 
 void InspectorDOMStorageResource::handleEvent(ScriptExecutionContext*, Event* event)
 {
     ASSERT(m_frontend);
-    ASSERT(eventNames().storageEvent == event->type());
+    if (event->type() != eventNames().storageEvent || !event->isStorageEvent())
+        return;
+
     StorageEvent* storageEvent = static_cast<StorageEvent*>(event);
     Storage* storage = storageEvent->storageArea();
     ExceptionCode ec = 0;
     bool isLocalStorage = (storage->frame()->domWindow()->localStorage(ec) == storage && !ec);
     if (isSameHostAndType(storage->frame(), isLocalStorage))
         m_frontend->updateDOMStorage(m_id);
 }
 
 bool InspectorDOMStorageResource::operator==(const EventListener& listener)
 {
     return (this == InspectorDOMStorageResource::cast(&listener));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(DOM_STORAGE) && ENABLE(INSPECTOR)