From 319d9e6f29cc2d27c0f72ce701d905d2402c350a Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 18 Feb 2009 19:47:21 +0000 Subject: Reduce the amount of included header files. Vast change like in "Oh God! This revision changes half of the source files!". Review URL: http://codereview.chromium.org/20378 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9958 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/SConscript | 3 + webkit/glue/alt_error_page_resource_fetcher.cc | 5 + webkit/glue/alt_error_page_resource_fetcher.h | 7 +- webkit/glue/chrome_client_impl.cc | 1 + webkit/glue/context_menu_client_impl.cc | 2 + webkit/glue/dom_serializer_unittest.cc | 1 + webkit/glue/feed_preview.cc | 2 +- webkit/glue/glue.vcproj | 1546 ++++++++++---------- webkit/glue/glue_util.cc | 21 +- webkit/glue/glue_util.h | 6 +- webkit/glue/inspector_client_impl.cc | 1 + webkit/glue/password_form_dom_manager.h | 3 - webkit/glue/plugins/webplugin_delegate_impl.h | 1 + webkit/glue/resource_handle_impl.cc | 1 + webkit/glue/resource_loader_bridge.cc | 32 + webkit/glue/resource_loader_bridge.h | 55 +- webkit/glue/webdatasource.h | 2 +- webkit/glue/webdatasource_impl.h | 9 +- webkit/glue/webframe.h | 6 - webkit/glue/webframe_impl.cc | 8 + webkit/glue/webframe_impl.h | 15 +- webkit/glue/webhistoryitem.h | 11 +- webkit/glue/webhistoryitem_impl.h | 10 +- webkit/glue/webplugin_delegate.cc | 36 + webkit/glue/webplugin_delegate.h | 33 +- webkit/glue/webresponse.h | 9 +- webkit/glue/webresponse_impl.h | 10 +- webkit/glue/weburlrequest.h | 8 +- webkit/glue/weburlrequest_impl.cc | 1 + webkit/glue/weburlrequest_impl.h | 8 +- webkit/glue/webview_delegate.cc | 29 + webkit/glue/webview_delegate.h | 21 +- .../test_shell/simple_resource_loader_bridge.cc | 1 + webkit/webkit.xcodeproj/project.pbxproj | 12 + 34 files changed, 1006 insertions(+), 910 deletions(-) create mode 100644 webkit/glue/resource_loader_bridge.cc create mode 100644 webkit/glue/webplugin_delegate.cc create mode 100644 webkit/glue/webview_delegate.cc (limited to 'webkit') diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 50f1c6f..ba4c351 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -65,6 +65,7 @@ input_files = [ 'plugins/plugin_string_stream.cc', 'resource_fetcher.cc', 'resource_handle_impl.cc', + 'resource_loader_bridge.cc', 'searchable_form_data.cc', 'stacking_order_iterator.cc', 'webcursor.cc', @@ -76,10 +77,12 @@ input_files = [ 'webhistoryitem_impl.cc', 'webkit_glue.cc', 'webmediaplayer_impl.cc', + 'webplugin_delegate.cc', 'webplugin_impl.cc', 'webtextinput_impl.cc', 'weburlrequest_impl.cc', 'webwidget_impl.cc', + 'webview_delegate.cc', 'webview_impl.cc', ] diff --git a/webkit/glue/alt_error_page_resource_fetcher.cc b/webkit/glue/alt_error_page_resource_fetcher.cc index 7d04c4e..722c6c9 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.cc +++ b/webkit/glue/alt_error_page_resource_fetcher.cc @@ -14,7 +14,9 @@ MSVC_POP_WARNING(); #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/glue_util.h" +#include "webkit/glue/webdatasource.h" #include "webkit/glue/webframe_impl.h" +#include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/webview.h" @@ -36,6 +38,9 @@ AltErrorPageResourceFetcher::AltErrorPageResourceFetcher( kDownloadTimeoutSec, this)); } +AltErrorPageResourceFetcher::~AltErrorPageResourceFetcher() { +} + void AltErrorPageResourceFetcher::OnURLFetchComplete( const WebCore::ResourceResponse& response, const std::string& data) { diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h index 171aad6..8181a99 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.h +++ b/webkit/glue/alt_error_page_resource_fetcher.h @@ -13,13 +13,13 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "Timer.h" MSVC_POP_WARNING(); -#include "base/basictypes.h" #include "base/scoped_ptr.h" #include "webkit/glue/resource_fetcher.h" #include "webkit/glue/weberror_impl.h" -#include "webkit/glue/weburlrequest.h" +class ResourceFetcherWithTimeout; class WebFrameImpl; +class WebRequest; class WebView; // Used for downloading alternate dns error pages. Once downloading is done @@ -30,6 +30,7 @@ class AltErrorPageResourceFetcher : public ResourceFetcher::Delegate { const WebErrorImpl& web_error, WebFrameImpl* web_frame, const GURL& url); + ~AltErrorPageResourceFetcher(); virtual void OnURLFetchComplete(const WebCore::ResourceResponse& response, const std::string& data); @@ -44,7 +45,7 @@ class AltErrorPageResourceFetcher : public ResourceFetcher::Delegate { // Does the actual fetching. scoped_ptr fetcher_; - DISALLOW_EVIL_CONSTRUCTORS(AltErrorPageResourceFetcher); + DISALLOW_COPY_AND_ASSIGN(AltErrorPageResourceFetcher); }; #endif // WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H__ diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index f23cf43..8d3f161 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -31,6 +31,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webinputevent.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/webview_impl.h" #include "webkit/glue/webwidget_impl.h" diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index 584cbe0..79ee0a4 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -26,6 +26,8 @@ MSVC_POP_WARNING(); #include "webkit/glue/context_menu.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webdocumentloader_impl.h" +#include "webkit/glue/webresponse.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webview_impl.h" #include "base/word_iterator.h" diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index 93cf20d..317a374 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -31,6 +31,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_serializer.h" #include "webkit/glue/dom_serializer_delegate.h" +#include "webkit/glue/glue_util.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webview.h" diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc index 5d6962b..f14753a 100644 --- a/webkit/glue/feed_preview.cc +++ b/webkit/glue/feed_preview.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "config.h" - #include "base/compiler_specific.h" #include "webkit/glue/feed_preview.h" @@ -17,6 +16,7 @@ MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" +#include "googleurl/src/gurl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/glue.vcproj b/webkit/glue/glue.vcproj index acaad6f..f31623c 100644 --- a/webkit/glue/glue.vcproj +++ b/webkit/glue/glue.vcproj @@ -1,767 +1,779 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc index a81da6b..113d413 100644 --- a/webkit/glue/glue_util.cc +++ b/webkit/glue/glue_util.cc @@ -3,23 +3,28 @@ // found in the LICENSE file. #include "config.h" -#include +#include "base/compiler_specific.h" #include "webkit/glue/glue_util.h" -#include "base/compiler_specific.h" -#include "base/gfx/rect.h" -#include "base/string_piece.h" -#include "base/string_util.h" -#include "base/sys_string_conversions.h" + +#include MSVC_PUSH_WARNING_LEVEL(0); -#undef LOG #include "CString.h" #include "IntRect.h" #include "PlatformString.h" +#include "KURL.h" MSVC_POP_WARNING(); -#include "KURL.h" +#undef LOG + +#include "base/compiler_specific.h" +#include "base/gfx/rect.h" +#include "base/string_piece.h" +#include "base/string_util.h" +#include "base/sys_string_conversions.h" +#include "googleurl/src/gurl.h" + namespace webkit_glue { diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h index 0bb7106..576ec34 100644 --- a/webkit/glue/glue_util.h +++ b/webkit/glue/glue_util.h @@ -5,11 +5,10 @@ #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ #define WEBKIT_GLUE_GLUE_UTIL_H_ -#include - #include "base/file_path.h" #include "base/string16.h" -#include "googleurl/src/gurl.h" + +class GURL; namespace WebCore { class CString; @@ -57,4 +56,3 @@ WebCore::IntRect ToIntRect(const gfx::Rect& r); } // namespace webkit_glue #endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ - diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc index e997a73..cc28821 100644 --- a/webkit/glue/inspector_client_impl.cc +++ b/webkit/glue/inspector_client_impl.cc @@ -17,6 +17,7 @@ MSVC_POP_WARNING(); #undef LOG #include "webkit/glue/inspector_client_impl.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview_impl.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/webkit/glue/password_form_dom_manager.h b/webkit/glue/password_form_dom_manager.h index fcca8c7..6beb0ab 100644 --- a/webkit/glue/password_form_dom_manager.h +++ b/webkit/glue/password_form_dom_manager.h @@ -8,9 +8,6 @@ #include "webkit/glue/form_data.h" #include "webkit/glue/password_form.h" -#include -#include - namespace WebCore { class HTMLFormElement; class HTMLInputElement; diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h index 46d0f95..0474d26 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.h +++ b/webkit/glue/plugins/webplugin_delegate_impl.h @@ -12,6 +12,7 @@ #include "base/file_path.h" #include "base/gfx/native_widget_types.h" +#include "base/gfx/rect.h" #include "base/ref_counted.h" #include "base/task.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc index 66f321d..ee7acb4 100644 --- a/webkit/glue/resource_handle_impl.cc +++ b/webkit/glue/resource_handle_impl.cc @@ -57,6 +57,7 @@ MSVC_POP_WARNING(); #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/load_flags.h" +#include "net/http/http_response_headers.h" using webkit_glue::ResourceLoaderBridge; using base::Time; diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc new file mode 100644 index 0000000..5b29fb0 --- /dev/null +++ b/webkit/glue/resource_loader_bridge.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +// + +#include "config.h" + +#include "webkit/glue/resource_loader_bridge.h" + +#include "net/http/http_response_headers.h" + +namespace webkit_glue { + +ResourceLoaderBridge::ResponseInfo::ResponseInfo() { +} + +ResourceLoaderBridge::ResponseInfo::~ResponseInfo() { +} + +ResourceLoaderBridge::SyncLoadResponse::SyncLoadResponse() { +} + +ResourceLoaderBridge::SyncLoadResponse::~SyncLoadResponse() { +} + +ResourceLoaderBridge::ResourceLoaderBridge() { +} + +ResourceLoaderBridge::~ResourceLoaderBridge() { +} + +} // namespace webkit_glue diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index ce09b21..2698cb4 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -14,26 +14,29 @@ // In turn, the bridge's owner on the WebKit end will implement the Peer // interface, which we will use to communicate notifications back. -#ifndef RESOURCE_LOADER_BRIDGE_H__ -#define RESOURCE_LOADER_BRIDGE_H__ +#ifndef RESOURCE_LOADER_BRIDGE_H_ +#define RESOURCE_LOADER_BRIDGE_H_ -#include - -#include "base/basictypes.h" #include "base/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" #include "webkit/glue/resource_type.h" class WebFrame; +namespace net { +class HttpResponseHeaders; +} + namespace webkit_glue { class ResourceLoaderBridge { public: struct ResponseInfo { + ResponseInfo(); + ~ResponseInfo(); + // The time at which the request was made that resulted in this response. // For cached responses, this time could be "far" in the past. base::Time request_time; @@ -60,7 +63,24 @@ class ResourceLoaderBridge { int64 content_length; }; - // generated by the bridge. This is implemented by our custom resource loader + // See the SyncLoad method declared below. (The name of this struct is not + // suffixed with "Info" because it also contains the response data.) + struct SyncLoadResponse : ResponseInfo { + SyncLoadResponse(); + ~SyncLoadResponse(); + + // The response status. + URLRequestStatus status; + + // The final URL of the response. This may differ from the request URL in + // the case of a server redirect. + GURL url; + + // The response data. + std::string data; + }; + + // Generated by the bridge. This is implemented by our custom resource loader // within webkit. The Peer and it's bridge should have identical lifetimes // as they represent each end of a communication channel. // @@ -100,7 +120,7 @@ class ResourceLoaderBridge { // use Create() for construction, but anybody can delete at any time, // INCLUDING during processing of callbacks. - virtual ~ResourceLoaderBridge() {} + virtual ~ResourceLoaderBridge(); // Call this method to make a new instance. The method name is a HTTP-style // method name (e.g., "GET" or "POST"). The URL should be an absolute URL @@ -169,20 +189,6 @@ class ResourceLoaderBridge { // method may only be called after a successful call to the Start method. virtual void SetDefersLoading(bool value) = 0; - // See the SyncLoad method declared below. (The name of this struct is not - // suffixed with "Info" because it also contains the response data.) - struct SyncLoadResponse : ResponseInfo { - // The response status. - URLRequestStatus status; - - // The final URL of the response. This may differ from the request URL in - // the case of a server redirect. - GURL url; - - // The response data. - std::string data; - }; - // Call this method to load the resource synchronously (i.e., in one shot). // This is an alternative to the Start method. Be warned that this method // will block the calling thread until the resource is fully downloaded or an @@ -194,7 +200,7 @@ class ResourceLoaderBridge { protected: // construction must go through Create() - ResourceLoaderBridge() {} + ResourceLoaderBridge(); private: DISALLOW_EVIL_CONSTRUCTORS(ResourceLoaderBridge); @@ -202,5 +208,4 @@ class ResourceLoaderBridge { } // namespace webkit_glue -#endif // RESOURCE_LOADER_BRIDGE__ - +#endif // RESOURCE_LOADER_BRIDGE_ diff --git a/webkit/glue/webdatasource.h b/webkit/glue/webdatasource.h index 02d9a48..3f3eb0d 100644 --- a/webkit/glue/webdatasource.h +++ b/webkit/glue/webdatasource.h @@ -8,8 +8,8 @@ #include #include "base/basictypes.h" -#include "googleurl/src/gurl.h" +class GURL; struct PasswordForm; class SearchableFormData; class WebFrame; diff --git a/webkit/glue/webdatasource_impl.h b/webkit/glue/webdatasource_impl.h index e4394bb..d5daa22 100644 --- a/webkit/glue/webdatasource_impl.h +++ b/webkit/glue/webdatasource_impl.h @@ -23,13 +23,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ -#define WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ +#define WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ #include "webkit/glue/webdatasource.h" #include "webkit/glue/webresponse_impl.h" #include "webkit/glue/weburlrequest_impl.h" -#include "base/basictypes.h" struct PasswordForm; class SearchableFormData; @@ -91,7 +90,7 @@ private: // who modifies this when to keep it up to date. std::vector redirect_chain_; - DISALLOW_EVIL_CONSTRUCTORS(WebDataSourceImpl); + DISALLOW_COPY_AND_ASSIGN(WebDataSourceImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ +#endif // #ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index a500bdc..75b2fb9 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -5,12 +5,8 @@ #ifndef WEBKIT_GLUE_WEBFRAME_H_ #define WEBKIT_GLUE_WEBFRAME_H_ -#include - -#include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/gfx/size.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/platform_canvas.h" #include "webkit/glue/console_message_level.h" @@ -30,8 +26,6 @@ class Rect; class Size; } -// TODO(darin): use GURL everywhere a URL string appears - // Every frame in a web page is represented by one WebFrame, including the // outermost frame. class WebFrame { diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index a6d3c96..fcfd641 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -134,10 +134,13 @@ MSVC_POP_WARNING(); #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/glue_serialize.h" +#include "webkit/glue/glue_util.h" #include "webkit/glue/webdocumentloader_impl.h" +#include "webkit/glue/webdatasource_impl.h" #include "webkit/glue/weberror_impl.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webhistoryitem_impl.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webtextinput_impl.h" #include "webkit/glue/webview_impl.h" @@ -590,6 +593,11 @@ void WebFrameImpl::CacheCurrentRequestInfo(WebDataSourceImpl* datasource) { datasource->SetExtraData(extra); } +void WebFrameImpl::set_currently_loading_history_item( + WebHistoryItemImpl* item) { + currently_loading_history_item_ = item; +} + void WebFrameImpl::StopLoading() { if (!frame_) return; diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index 3633651..546b8c9b 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -26,20 +26,12 @@ #ifndef WEBKIT_GLUE_WEBFRAME_IMPL_H_ #define WEBKIT_GLUE_WEBFRAME_IMPL_H_ -#include - -#include "base/basictypes.h" -#include "base/compiler_specific.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "skia/ext/platform_canvas.h" #include "webkit/glue/password_autocomplete_listener.h" -#include "webkit/glue/webdatasource_impl.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webframeloaderclient_impl.h" -#include "webkit/glue/webhistoryitem_impl.h" -#include "webkit/glue/webplugin_delegate.h" -#include "webkit/glue/webview_delegate.h" MSVC_PUSH_WARNING_LEVEL(0); #include "ResourceHandleClient.h" @@ -48,7 +40,10 @@ MSVC_PUSH_WARNING_LEVEL(0); MSVC_POP_WARNING(); class AltErrorPageResourceFetcher; +class WebDataSourceImpl; class WebErrorImpl; +class WebHistoryItemImpl; +class WebPluginDelegate; class WebRequest; class WebView; class WebViewImpl; @@ -220,9 +215,7 @@ class WebFrameImpl : public WebFrame, public base::RefCounted { // If currently_loading_request is NULL, does nothing. void CacheCurrentRequestInfo(WebDataSourceImpl* datasource); - void set_currently_loading_history_item(WebHistoryItemImpl* item) { - currently_loading_history_item_ = item; - } + void set_currently_loading_history_item(WebHistoryItemImpl* item); // Getters for the impls corresponding to Get(Provisional)DataSource. They // may return NULL if there is no corresponding data source. diff --git a/webkit/glue/webhistoryitem.h b/webkit/glue/webhistoryitem.h index 65c12eb..6757211 100644 --- a/webkit/glue/webhistoryitem.h +++ b/webkit/glue/webhistoryitem.h @@ -2,13 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBHISTORYITEM_H__ -#define WEBKIT_GLUE_WEBHISTORYITEM_H__ +#ifndef WEBKIT_GLUE_WEBHISTORYITEM_H_ +#define WEBKIT_GLUE_WEBHISTORYITEM_H_ -#include - -#include "base/basictypes.h" -#include "base/ref_counted.h" #include "webkit/glue/weburlrequest.h" // for WebRequest::ExtraData class GURL; @@ -40,5 +36,4 @@ class WebHistoryItem : public base::RefCounted { DISALLOW_EVIL_CONSTRUCTORS(WebHistoryItem); }; -#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_H_ diff --git a/webkit/glue/webhistoryitem_impl.h b/webkit/glue/webhistoryitem_impl.h index 983c858..b28fb91 100644 --- a/webkit/glue/webhistoryitem_impl.h +++ b/webkit/glue/webhistoryitem_impl.h @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ -#define WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ +#define WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ -#include "base/basictypes.h" #include "webkit/glue/webhistoryitem.h" #include "googleurl/src/gurl.h" @@ -42,8 +41,7 @@ class WebHistoryItemImpl : public WebHistoryItem { scoped_refptr extra_data_; private: - DISALLOW_EVIL_CONSTRUCTORS(WebHistoryItemImpl); + DISALLOW_COPY_AND_ASSIGN(WebHistoryItemImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ diff --git a/webkit/glue/webplugin_delegate.cc b/webkit/glue/webplugin_delegate.cc new file mode 100644 index 0000000..ea1f285 --- /dev/null +++ b/webkit/glue/webplugin_delegate.cc @@ -0,0 +1,36 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "config.h" + +#undef LOG + +#include "webkit/glue/webplugin_delegate.h" + +#include "base/logging.h" +#include "base/gfx/rect.h" + +bool WebPluginDelegate::IsWindowless() const { + NOTREACHED(); + return false; +} + +const gfx::Rect& WebPluginDelegate::GetRect() const { + NOTREACHED(); + static gfx::Rect dummy; + return dummy; +} + +const gfx::Rect& WebPluginDelegate::GetClipRect() const { + NOTREACHED(); + return GetRect(); +} + +#if defined(OS_WIN) +// Returns a combinaison of PluginQuirks. +int WebPluginDelegate::GetQuirks() const { + NOTREACHED(); + return 0; +} +#endif diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h index 254d94f..a7bf9e1 100644 --- a/webkit/glue/webplugin_delegate.h +++ b/webkit/glue/webplugin_delegate.h @@ -5,25 +5,25 @@ #ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ #define WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ -#include #include -#include "base/basictypes.h" -#include "base/file_path.h" #include "base/gfx/native_widget_types.h" -#include "base/gfx/rect.h" -#include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" // TODO(port): put in OS_WIN check. typedef struct HDC__* HDC; struct NPObject; +class FilePath; class GURL; class WebCursor; class WebPlugin; class WebPluginResourceClient; +namespace gfx { +class Rect; +} + // This is the interface that a plugin implementation needs to provide. class WebPluginDelegate { public: @@ -139,32 +139,19 @@ class WebPluginDelegate { virtual void URLRequestRouted(const std::string&url, bool notify_needed, void* notify_data) = 0; - virtual bool IsWindowless() const { - NOTREACHED(); - return false; - } + virtual bool IsWindowless() const; - virtual const gfx::Rect& GetRect() const { - NOTREACHED(); - static gfx::Rect dummy; - return dummy; - } + virtual const gfx::Rect& GetRect() const; - virtual const gfx::Rect& GetClipRect() const { - NOTREACHED(); - return GetRect(); - } + virtual const gfx::Rect& GetClipRect() const; #if defined(OS_WIN) // Returns a combinaison of PluginQuirks. - virtual int GetQuirks() const { - NOTREACHED(); - return 0; - } + virtual int GetQuirks() const; #endif private: - DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegate); + DISALLOW_COPY_AND_ASSIGN(WebPluginDelegate); }; #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ diff --git a/webkit/glue/webresponse.h b/webkit/glue/webresponse.h index 7259057..34abd935 100644 --- a/webkit/glue/webresponse.h +++ b/webkit/glue/webresponse.h @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLRESPONSE_H__ -#define WEBKIT_GLUE_WEBURLRESPONSE_H__ +#ifndef WEBKIT_GLUE_WEBURLRESPONSE_H_ +#define WEBKIT_GLUE_WEBURLRESPONSE_H_ #include +#include "base/basictypes.h" + class GURL; class WebResponse { @@ -33,5 +35,4 @@ private: DISALLOW_EVIL_CONSTRUCTORS(WebResponse); }; -#endif // #ifndef WEBKIT_GLUE_WEBURLRESPONSE_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLRESPONSE_H_ diff --git a/webkit/glue/webresponse_impl.h b/webkit/glue/webresponse_impl.h index 504094b..e9dfddf 100644 --- a/webkit/glue/webresponse_impl.h +++ b/webkit/glue/webresponse_impl.h @@ -2,12 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H__ -#define WEBKIT_GLUE_WEBRESPONSEIMPL_H__ +#ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H_ +#define WEBKIT_GLUE_WEBRESPONSEIMPL_H_ -#include - -#include "googleurl/src/gurl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webresponse.h" @@ -48,5 +45,4 @@ class WebResponseImpl : public WebResponse { DISALLOW_EVIL_CONSTRUCTORS(WebResponseImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H_ diff --git a/webkit/glue/weburlrequest.h b/webkit/glue/weburlrequest.h index d62ccbf..537b87d 100644 --- a/webkit/glue/weburlrequest.h +++ b/webkit/glue/weburlrequest.h @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLREQUEST_H__ -#define WEBKIT_GLUE_WEBURLREQUEST_H__ +#ifndef WEBKIT_GLUE_WEBURLREQUEST_H_ +#define WEBKIT_GLUE_WEBURLREQUEST_H_ #include #include -#include "base/basictypes.h" #include "base/ref_counted.h" enum WebRequestCachePolicy { @@ -127,5 +126,4 @@ class WebRequest { virtual ~WebRequest() { } }; -#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_H_ diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc index 6734a7e..b4416f9 100644 --- a/webkit/glue/weburlrequest_impl.cc +++ b/webkit/glue/weburlrequest_impl.cc @@ -13,6 +13,7 @@ MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" +#include "googleurl/src/gurl.h" #include "net/base/upload_data.h" #include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/glue_serialize.h" diff --git a/webkit/glue/weburlrequest_impl.h b/webkit/glue/weburlrequest_impl.h index b3c5bc7..0548c26 100644 --- a/webkit/glue/weburlrequest_impl.h +++ b/webkit/glue/weburlrequest_impl.h @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ -#define WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ +#define WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "webkit/glue/weburlrequest.h" @@ -66,5 +65,4 @@ class WebRequestImpl : public WebRequest { scoped_refptr extra_data_; }; -#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ diff --git a/webkit/glue/webview_delegate.cc b/webkit/glue/webview_delegate.cc new file mode 100644 index 0000000..f4afb2b --- /dev/null +++ b/webkit/glue/webview_delegate.cc @@ -0,0 +1,29 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "config.h" + +#undef LOG + +#include "webkit/glue/webview_delegate.h" + +#include "base/logging.h" +#include "googleurl/src/gurl.h" + +void WebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) { + // This method is only used in test shell, which overrides this + // method. + NOTREACHED(); +} + +void WebViewDelegate::SetSelectTrailingWhitespaceEnabled(bool enabled) { + // This method is only used in test shell, which overrides this + // method. + NOTREACHED(); +} + +GURL WebViewDelegate::GetAlternateErrorPageURL(const GURL& failedURL, + ErrorPageType error_type) { + return GURL(); +} diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 892c25e..359d45c 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -26,15 +26,10 @@ #ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ #define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ -#include #include -#include "base/basictypes.h" -#include "base/logging.h" -#include "googleurl/src/gurl.h" #include "webkit/glue/context_menu.h" #include "webkit/glue/webwidget_delegate.h" -#include "webkit/glue/window_open_disposition.h" namespace gfx { class Point; @@ -657,11 +652,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { return true; } - virtual void SetSmartInsertDeleteEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); - } + virtual void SetSmartInsertDeleteEnabled(bool enabled); virtual bool IsSelectTrailingWhitespaceEnabled() { #if defined(OS_WIN) @@ -671,11 +662,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { #endif } - virtual void SetSelectTrailingWhitespaceEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); - } + virtual void SetSelectTrailingWhitespaceEnabled(bool enabled); virtual void DidBeginEditing() { } virtual void DidChangeSelection(bool is_empty_selection) { } @@ -711,9 +698,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { // error pages. |error_name| tells the delegate what type of error page we // want (e.g., 404 vs dns errors). virtual GURL GetAlternateErrorPageURL(const GURL& failedURL, - ErrorPageType error_type) { - return GURL(); - } + ErrorPageType error_type); // History Related --------------------------------------------------------- diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index d7737f3..c81d205 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -40,6 +40,7 @@ #include "net/base/io_buffer.h" #include "net/base/net_util.h" #include "net/base/upload_data.h" +#include "net/http/http_response_headers.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request.h" #include "webkit/glue/resource_loader_bridge.h" diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index f696e94..8c74440 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -82,6 +82,7 @@ 53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC37F0F291F4300233688 /* ThreadableLoader.cpp */; }; 53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */; }; 53E8BE100EC36A4E00B3F8B0 /* dom_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405050D92E3DA0006B936 /* dom_operations.cc */; }; + 58E986F9F1CA5FC0A89313B0 /* webview_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4A48A12D02638BF9107FD26D /* webview_delegate.cc */; }; 6B873B9C0A9CB97EE5F350BC /* V8DOMWindowCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C1FF1C3BB820B928CFE9BD /* V8DOMWindowCustom.cpp */; }; 7B1438070E7874FC00901940 /* webframeloaderclient_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254053F0D92E3DA0006B936 /* webframeloaderclient_impl.cc */; }; 7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85B60D7F28F5001ECF42 /* Assertions.cpp */; }; @@ -1311,6 +1312,7 @@ AB9552760F37AA2E0015C8FB /* webplugin_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB9552750F37AA2E0015C8FB /* webplugin_impl.cc */; }; AB9552AE0F37AC0B0015C8FB /* stacking_order_iterator.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB9552AD0F37AC0B0015C8FB /* stacking_order_iterator.cc */; }; ABF923090F3A388C009B64EC /* webplugin_delegate_impl_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405ED0D92E3FF0006B936 /* webplugin_delegate_impl_mac.cc */; }; + B26072924B6C110181ECF928 /* webplugin_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */; }; B52EC24C0F2FE04A0051A2C4 /* FormControlElementWithState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EC24B0F2FE04A0051A2C4 /* FormControlElementWithState.cpp */; }; B52EC2550F2FE07B0051A2C4 /* CachedFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EC2530F2FE07B0051A2C4 /* CachedFrame.cpp */; }; B58DCCE90F27DF0100BF697A /* InputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58DCCE80F27DF0100BF697A /* InputElement.cpp */; }; @@ -1359,6 +1361,7 @@ E48A06DE0E3F840F00172919 /* image_resource_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06D80E3F840F00172919 /* image_resource_fetcher.cc */; }; E4A238C70E3FA19C002BDE14 /* image_decoder.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4A238C50E3FA19C002BDE14 /* image_decoder.cc */; }; E4E4C94A0E797648009A687C /* ImageSourceCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FBD0D7F3CC1001ECF42 /* ImageSourceCG.cpp */; }; + E7CC722700DA5F7E55527582 /* resource_loader_bridge.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */; }; FA5597EF54C7B6F57B05E0EF /* DOMTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 753B36EAFA2321BA827FFE23 /* DOMTimer.cpp */; }; FBBBF2E4099C8EA9BDAF80F9 /* CurrentTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */; }; /* End PBXBuildFile section */ @@ -1509,6 +1512,7 @@ 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerNavigator.cpp; sourceTree = ""; }; 04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerNavigator.h; sourceTree = ""; }; 0F9CD02EE3AE2D8974EDFE58 /* RenderBoxModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderBoxModelObject.h; sourceTree = ""; }; + 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webplugin_delegate.cc; sourceTree = ""; }; 1DF458E80DD265C670E05B03 /* RenderSelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSelectionInfo.h; sourceTree = ""; }; 20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = ""; }; 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PNGImageEncoder.cpp; path = "../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp"; sourceTree = SOURCE_ROOT; }; @@ -1593,6 +1597,7 @@ 41DE7CA40F424BEE0049BC24 /* V8HTMLSelectElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8HTMLSelectElementCustom.h; sourceTree = ""; }; 41DEA0670F27C0F900E40D43 /* BackForwardListChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardListChromium.cpp; sourceTree = ""; }; 41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = ""; }; + 4A48A12D02638BF9107FD26D /* webview_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webview_delegate.cc; sourceTree = ""; }; 4C04BF9CDE7B0B591087B440 /* RenderObjectChildList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectChildList.h; sourceTree = ""; }; 4CDA86D8A0B62BD0EBF07D78 /* AnimationControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationControllerPrivate.h; path = ../third_party/WebKit/WebCore/page/animation/AnimationControllerPrivate.h; sourceTree = SOURCE_ROOT; }; 4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteAuthorizer.cpp; sourceTree = ""; }; @@ -1906,6 +1911,7 @@ 53AAC3820F291F6300233688 /* ThreadableLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClient.h; sourceTree = ""; }; 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = ""; }; 53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = ""; }; + 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_loader_bridge.cc; sourceTree = ""; }; 619BC9B49D39DC88F3826A9B /* RenderObjectChildList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObjectChildList.cpp; sourceTree = ""; }; 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = ""; }; 6A9898388068C93C5A7C011C /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = ""; }; @@ -7675,6 +7681,7 @@ 825405280D92E3DA0006B936 /* resource_fetcher.h */, 825405260D92E3DA0006B936 /* resource_fetcher_unittest.cc */, 825405290D92E3DA0006B936 /* resource_handle_impl.cc */, + 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */, 8254052A0D92E3DA0006B936 /* resource_loader_bridge.h */, 8254052B0D92E3DA0006B936 /* resource_type.h */, 8254052C0D92E3DA0006B936 /* searchable_form_data.cc */, @@ -7712,6 +7719,7 @@ 825405490D92E3DB0006B936 /* webkit_resources.rc */, 8254054A0D92E3DB0006B936 /* webkit_strings.grd */, 8254054F0D92E3DB0006B936 /* webplugin.h */, + 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */, 8254054B0D92E3DB0006B936 /* webplugin_delegate.h */, AB9552750F37AA2E0015C8FB /* webplugin_impl.cc */, 8254054E0D92E3DB0006B936 /* webplugin_impl.h */, @@ -7726,6 +7734,7 @@ 825405560D92E3DB0006B936 /* weburlrequest_impl.cc */, 825405570D92E3DB0006B936 /* weburlrequest_impl.h */, 8254055C0D92E3DB0006B936 /* webview.h */, + 4A48A12D02638BF9107FD26D /* webview_delegate.cc */, 825405590D92E3DB0006B936 /* webview_delegate.h */, 8254055A0D92E3DB0006B936 /* webview_impl.cc */, 8254055B0D92E3DB0006B936 /* webview_impl.h */, @@ -9610,6 +9619,7 @@ 8255CEC20F16971600E53C11 /* plugin_string_stream.cc in Sources */, E45626F80E268F03005E4685 /* resource_fetcher.cc in Sources */, E45627160E268F26005E4685 /* resource_handle_impl.cc in Sources */, + E7CC722700DA5F7E55527582 /* resource_loader_bridge.cc in Sources */, E456270C0E268F03005E4685 /* searchable_form_data.cc in Sources */, AB9552AE0F37AC0B0015C8FB /* stacking_order_iterator.cc in Sources */, 4DB043A40EB1577900A5633C /* webcursor.cc in Sources */, @@ -9623,9 +9633,11 @@ E45627050E268F03005E4685 /* webinputevent_mac.mm in Sources */, E45627090E268F03005E4685 /* webkit_glue.cc in Sources */, 93AF57990F0198CD0073C62D /* webkit_glue_mac.mm in Sources */, + B26072924B6C110181ECF928 /* webplugin_delegate.cc in Sources */, AB9552760F37AA2E0015C8FB /* webplugin_impl.cc in Sources */, E45627040E268F03005E4685 /* webtextinput_impl.cc in Sources */, E45627020E268F03005E4685 /* weburlrequest_impl.cc in Sources */, + 58E986F9F1CA5FC0A89313B0 /* webview_delegate.cc in Sources */, E45626F40E268F03005E4685 /* webview_impl.cc in Sources */, E45626F30E268F03005E4685 /* webwidget_impl.cc in Sources */, ABF923090F3A388C009B64EC /* webplugin_delegate_impl_mac.cc in Sources */, -- cgit v1.1