Changeset 53671 in webkit


Ignore:
Timestamp:
Jan 21, 2010 8:21:21 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-21 Michael Nordman <Michael Nordman>

Reviewed by Darin Fisher.

Adds WebKit::WebDataSource::applicationCacheHost() to the API.
​https://bugs.webkit.org/show_bug.cgi?id=33880

  • WebKit.gyp:
  • public/WebDataSource.h:
  • src/ApplicationCacheHost.cpp:
  • src/ApplicationCacheHostInternal.h: Copied from WebKit/chromium/src/ApplicationCacheHost.cpp. (WebCore::ApplicationCacheHostInternal::notifyEventListener): (WebCore::ApplicationCacheHostInternal::toWebApplicationCacheHost):
  • src/WebDataSourceImpl.cpp: (WebKit::WebDataSourceImpl::applicationCacheHost):
  • src/WebDataSourceImpl.h:
Location:
trunk/WebKit/chromium
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r53641 r53671  
     12010-01-21  Michael Nordman  <michaeln@google.com>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Adds WebKit::WebDataSource::applicationCacheHost() to the API.
     6        https://bugs.webkit.org/show_bug.cgi?id=33880
     7
     8        * WebKit.gyp:
     9        * public/WebDataSource.h:
     10        * src/ApplicationCacheHost.cpp:
     11        * src/ApplicationCacheHostInternal.h: Copied from WebKit/chromium/src/ApplicationCacheHost.cpp.
     12        (WebCore::ApplicationCacheHostInternal::notifyEventListener):
     13        (WebCore::ApplicationCacheHostInternal::toWebApplicationCacheHost):
     14        * src/WebDataSourceImpl.cpp:
     15        (WebKit::WebDataSourceImpl::applicationCacheHost):
     16        * src/WebDataSourceImpl.h:
     17
    1182010-01-21  Eric Uhrhane  <ericu@chromium.org>
    219

  • trunk/WebKit/chromium/WebKit.gyp

    r53269 r53671  
    191191                'public/win/WebScreenInfoFactory.h',
    192192                'src/ApplicationCacheHost.cpp',
     193                'src/ApplicationCacheHostInternal.h',
    193194                'src/AssertMatchingEnums.cpp',
    194195                'src/AutocompletePopupMenuClient.cpp',

  • trunk/WebKit/chromium/public/WebDataSource.h

    r50680 r53671  
    3737namespace WebKit {
    3838
     39class WebApplicationCacheHost;
    3940class WebString;
    4041class WebURL;
    … …  
    9293    virtual void setExtraData(ExtraData*) = 0;
    9394
     95    // The application cache host associated with this datasource.
     96    virtual WebApplicationCacheHost* applicationCacheHost() = 0;
     97
    9498protected:
    9599    ~WebDataSource() { }

  • trunk/WebKit/chromium/src/ApplicationCacheHost.cpp

    r50740 r53671  
    3434#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    3535
     36#include "ApplicationCacheHostInternal.h"
    3637#include "DocumentLoader.h"
    3738#include "DOMApplicationCache.h"
    3839#include "Frame.h"
    3940#include "Settings.h"
    40 #include "WebApplicationCacheHost.h"
    41 #include "WebApplicationCacheHostClient.h"
    42 #include "WebKit.h"
    43 #include "WebKitClient.h"
    4441#include "WebURL.h"
    4542#include "WebURLError.h"
    … …  
    5249namespace WebCore {
    5350
    54 // ApplicationCacheHostInternal -----------------------------------------------
    55 
    56 class ApplicationCacheHostInternal : public WebApplicationCacheHostClient {
    57 public:
    58     ApplicationCacheHostInternal(ApplicationCacheHost* host)
    59         : m_innerHost(host)
    60     {
    61         m_outerHost.set(WebKit::webKitClient()->createApplicationCacheHost(this));
    62     }
    63 
    64     virtual void notifyEventListener(WebApplicationCacheHost::EventID eventID)
    65     {
    66         m_innerHost->notifyDOMApplicationCache(
    67             static_cast<ApplicationCacheHost::EventID>(eventID));
    68     }
    69 
    70     ApplicationCacheHost* m_innerHost;
    71     OwnPtr<WebApplicationCacheHost> m_outerHost;
    72 };
    73 
    74 // ApplicationCacheHost -------------------------------------------------------
    7551// We provide a custom implementation of this class that calls out to the
    7652// embedding application instead of using WebCore's built in appcache system.

  • trunk/WebKit/chromium/src/WebDataSourceImpl.cpp

    r50719 r53671  
    3232#include "WebDataSourceImpl.h"
    3333
     34#include "ApplicationCacheHostInternal.h"
    3435#include "WebURL.h"
    3536#include "WebURLError.h"
    … …  
    109110}
    110111
     112WebApplicationCacheHost* WebDataSourceImpl::applicationCacheHost() {
     113#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     114    return ApplicationCacheHostInternal::toWebApplicationCacheHost(DocumentLoader::applicationCacheHost());
     115#else
     116    return 0;
     117#endif
     118}
     119
    111120WebNavigationType WebDataSourceImpl::toWebNavigationType(NavigationType type)
    112121{

  • trunk/WebKit/chromium/src/WebDataSourceImpl.h

    r50719 r53671  
    4747#include <wtf/Vector.h>
    4848
    49 
    5049namespace WebKit {
    5150
    … …  
    7473    virtual ExtraData* extraData() const;
    7574    virtual void setExtraData(ExtraData*);
     75    virtual WebApplicationCacheHost* applicationCacheHost();
    7676
    7777    static WebNavigationType toWebNavigationType(WebCore::NavigationType type);
Note: See TracChangeset for help on using the changeset viewer.