diff options
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/fileapi/file_system_file_util.h | 1 | ||||
-rw-r--r-- | webkit/fileapi/quota_file_util.h | 2 | ||||
-rw-r--r-- | webkit/glue/resource_fetcher.h | 2 | ||||
-rw-r--r-- | webkit/glue/resource_fetcher_unittest.cc | 8 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppapi_webplugin_impl.h | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 2 |
7 files changed, 12 insertions, 7 deletions
diff --git a/webkit/fileapi/file_system_file_util.h b/webkit/fileapi/file_system_file_util.h index f489490..b0e23cf 100644 --- a/webkit/fileapi/file_system_file_util.h +++ b/webkit/fileapi/file_system_file_util.h @@ -240,6 +240,7 @@ class FileSystemFileUtil { protected: FileSystemFileUtil() { } + virtual ~FileSystemFileUtil() { } // Deletes a directory and all entries under the directory. // diff --git a/webkit/fileapi/quota_file_util.h b/webkit/fileapi/quota_file_util.h index 4a9c952..eb34541 100644 --- a/webkit/fileapi/quota_file_util.h +++ b/webkit/fileapi/quota_file_util.h @@ -14,7 +14,7 @@ namespace fileapi { class QuotaFileUtil : public FileSystemFileUtil { public: static QuotaFileUtil* GetInstance(); - ~QuotaFileUtil() {} + virtual ~QuotaFileUtil() {} static const int64 kNoLimit; diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h index ca666c7..0a9de89 100644 --- a/webkit/glue/resource_fetcher.h +++ b/webkit/glue/resource_fetcher.h @@ -45,7 +45,7 @@ class ResourceFetcher : public WebKit::WebURLLoaderClient { ResourceFetcher( const GURL& url, WebKit::WebFrame* frame, WebKit::WebURLRequest::TargetType target_type, Callback* callback); - ~ResourceFetcher(); + virtual ~ResourceFetcher(); // Stop the request and don't call the callback. void Cancel(); diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc index 2888a94..9ef0fc6 100644 --- a/webkit/glue/resource_fetcher_unittest.cc +++ b/webkit/glue/resource_fetcher_unittest.cc @@ -40,6 +40,8 @@ class FetcherDelegate { StartTimer(); } + virtual ~FetcherDelegate() {} + ResourceFetcher::Callback* NewCallback() { return ::NewCallback(this, &FetcherDelegate::OnURLFetchComplete); } @@ -173,12 +175,14 @@ TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) { class EvilFetcherDelegate : public FetcherDelegate { public: + virtual ~EvilFetcherDelegate() {} + void SetFetcher(ResourceFetcher* fetcher) { fetcher_.reset(fetcher); } - void OnURLFetchComplete(const WebURLResponse& response, - const std::string& data) { + virtual void OnURLFetchComplete(const WebURLResponse& response, + const std::string& data) { // Destroy the ResourceFetcher here. We are testing that upon returning // to the ResourceFetcher that it does not crash. fetcher_.reset(); diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index db2db0c..940dece 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -13,7 +13,7 @@ namespace ppapi { class MockPluginDelegate : public PluginDelegate { public: MockPluginDelegate(); - ~MockPluginDelegate(); + virtual ~MockPluginDelegate(); virtual void PluginFocusChanged(bool focused); virtual void PluginCrashed(PluginInstance* instance); diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index 5644e94..e35471f 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -35,7 +35,7 @@ class WebPluginImpl : public WebKit::WebPlugin { private: friend class DeleteTask<WebPluginImpl>; - ~WebPluginImpl(); + virtual ~WebPluginImpl(); // WebKit::WebPlugin implementation. virtual bool initialize(WebKit::WebPluginContainer* container); diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index bacdd40..5673443 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -251,7 +251,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient, virtual WebKit::WebCookieJar* GetCookieJar(); TestWebViewDelegate(TestShell* shell); - ~TestWebViewDelegate(); + virtual ~TestWebViewDelegate(); void Reset(); void SetSmartInsertDeleteEnabled(bool enabled); |