WebKit update 48700:48721....

webkit/api/src/ApplicationCacheHost.cpp

 /*
  * 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:
  *
  *     * 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 45 matching lines @@
 class ApplicationCacheHostInternal : public WebApplicationCacheHostClient {
 public:
     ApplicationCacheHostInternal(ApplicationCacheHost* host)
         : m_innerHost(host)
     {
         m_outerHost.set(WebKit::webKitClient()->createApplicationCacheHost(this));
     }
 
     virtual void notifyEventListener(WebApplicationCacheHost::EventID eventID)
     {
-        m_innerHost->notifyEventListener(static_cast<ApplicationCacheHost::EventID>(eventID));
+        m_innerHost->notifyDOMApplicationCache(
+            static_cast<ApplicationCacheHost::EventID>(eventID));
     }
 
     ApplicationCacheHost* m_innerHost;
     OwnPtr<WebApplicationCacheHost> m_outerHost;
 };
 
 // ApplicationCacheHost -------------------------------------------------------
 // We provide a custom implementation of this class that calls out to the
 // embedding application instead of using WebCore's built in appcache system.
 // This file replaces webcore/appcache/ApplicationCacheHost.cpp in our build.
@@ skipping 133 matching lines @@
     // N/A to the chromium port which doesn't use the page cache.
     return false;
 }
 
 void ApplicationCacheHost::setDOMApplicationCache(DOMApplicationCache* domApplicationCache)
 {
     ASSERT(!m_domApplicationCache || !domApplicationCache);
     m_domApplicationCache = domApplicationCache;
 }
 
-void ApplicationCacheHost::notifyEventListener(EventID id)
+void ApplicationCacheHost::notifyDOMApplicationCache(EventID id)
 {
-    if (m_domApplicationCache)
-        m_domApplicationCache->callEventListener(id);
+    if (m_domApplicationCache) {
+        ExceptionCode ec = 0;
+        m_domApplicationCache->dispatchEvent(
+            Event::create(DOMApplicationCache::toEventType(id), false, false),
+            ec);
+        ASSERT(!ec);
+    }
 }
 
 ApplicationCacheHost::Status ApplicationCacheHost::status() const
 {
     return m_internal ? static_cast<Status>(m_internal->m_outerHost->status()) : UNCACHED;
 }
 
 bool ApplicationCacheHost::update()
 {
     return m_internal ? m_internal->m_outerHost->startUpdate() : false;
 }
 
 bool ApplicationCacheHost::swapCache()
 {
     return m_internal ? m_internal->m_outerHost->swapCache() : false;
 }
 
 bool ApplicationCacheHost::isApplicationCacheEnabled()
 {
     ASSERT(m_documentLoader->frame());
     return m_documentLoader->frame()->settings()
            && m_documentLoader->frame()->settings()->offlineWebApplicationCacheEnabled();
 }
 
 }  // namespace WebCore
 
 #endif  // ENABLE(OFFLINE_WEB_APPLICATIONS)