diff options
| -rw-r--r-- | chrome/common/app_cache/app_cache_context_impl.cc | 2 | ||||
| -rw-r--r-- | chrome/common/app_cache/app_cache_context_impl.h | 4 | ||||
| -rw-r--r-- | webkit/glue/webappcachecontext.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webappcachecontext.h | 4 | ||||
| -rw-r--r-- | webkit/glue/webframe.h | 6 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 3 |
6 files changed, 12 insertions, 11 deletions
diff --git a/chrome/common/app_cache/app_cache_context_impl.cc b/chrome/common/app_cache/app_cache_context_impl.cc index d50b467..c622001 100644 --- a/chrome/common/app_cache/app_cache_context_impl.cc +++ b/chrome/common/app_cache/app_cache_context_impl.cc @@ -39,7 +39,7 @@ void AppCacheContextImpl::Initialize(ContextType context_type, sender_->Send(new AppCacheMsg_ContextCreated(context_type, context_id_, - parent ? parent->context_id() + parent ? parent->GetContextID() : kNoAppCacheContextId)); } diff --git a/chrome/common/app_cache/app_cache_context_impl.h b/chrome/common/app_cache/app_cache_context_impl.h index 7ca7ee3..dadf99d 100644 --- a/chrome/common/app_cache/app_cache_context_impl.h +++ b/chrome/common/app_cache/app_cache_context_impl.h @@ -19,8 +19,8 @@ class AppCacheContextImpl : public WebAppCacheContext { virtual ~AppCacheContextImpl(); // WebAppCacheContext implementation - virtual int context_id() { return context_id_; } - virtual int64 app_cache_id() { return app_cache_id_; } + virtual int GetContextID() { return context_id_; } + virtual int64 GetAppCacheID() { return app_cache_id_; } virtual void Initialize(WebAppCacheContext::ContextType context_type, WebAppCacheContext* opt_parent); virtual void SelectAppCacheWithoutManifest( diff --git a/webkit/glue/webappcachecontext.cc b/webkit/glue/webappcachecontext.cc index 0194ded..6092a26 100644 --- a/webkit/glue/webappcachecontext.cc +++ b/webkit/glue/webappcachecontext.cc @@ -10,8 +10,8 @@ WebAppCacheContext::WebAppCacheFactoryProc factory_proc = NULL; class NoopWebAppCacheContext : public WebAppCacheContext { public: - virtual int context_id() { return kNoAppCacheContextId; } - virtual int64 app_cache_id() { return kNoAppCacheId; } + virtual int GetContextID() { return kNoAppCacheContextId; } + virtual int64 GetAppCacheID() { return kNoAppCacheId; } virtual void Initialize(ContextType context_type, WebAppCacheContext* opt_parent) {} virtual void SelectAppCacheWithoutManifest( diff --git a/webkit/glue/webappcachecontext.h b/webkit/glue/webappcachecontext.h index 84d167c..5d2fc53 100644 --- a/webkit/glue/webappcachecontext.h +++ b/webkit/glue/webappcachecontext.h @@ -49,12 +49,12 @@ class WebAppCacheContext { static void SetFactory(WebAppCacheFactoryProc factory_proc); // Unique id within the child process housing this context - virtual int context_id() = 0; + virtual int GetContextID() = 0; // Which appcache is associated with the context. There are windows of // time where the appcache is not yet known, the return value is // kUnknownAppCacheId in that case. - virtual int64 app_cache_id() = 0; + virtual int64 GetAppCacheID() = 0; // The following methods result in async messages being sent to the // browser process. The initialize method tells the browser process about diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index 6a9c47b..6849573 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -383,6 +383,9 @@ class WebFrame { // mode. virtual float PrintPage(int page, skia::PlatformCanvas* canvas) = 0; + // Reformats the web frame for screen display. + virtual void EndPrint() = 0; + // Initiates app cache selection for the context with the resource currently // committed in the webframe. virtual void SelectAppCacheWithoutManifest() = 0; @@ -391,9 +394,6 @@ class WebFrame { // Returns a pointer to the WebAppCacheContext for this frame. virtual WebAppCacheContext* GetAppCacheContext() const = 0; - // Reformats the web frame for screen display. - virtual void EndPrint() = 0; - // Only for test_shell virtual int PendingFrameUnloadEventCount() const = 0; diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index fb44f4d..e6e2c29 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -236,7 +236,8 @@ void WebFrameLoaderClient::dispatchWillSendRequest( net_agent->WillSendRequest(loader, identifier, request); } - request.setAppCacheContextID(webframe_->GetAppCacheContext()->context_id()); + request.setAppCacheContextID( + webframe_->GetAppCacheContext()->GetContextID()); } bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, |