summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 17:03:29 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 17:03:29 +0000
commita79cd3fb99ff28b50b376cf6ef2c1e5efe6c100b (patch)
tree33047aaca3f595283f89829d724009cd9f8e6106
parent8abc94dab98314d61d942ca6155fc3608659c070 (diff)
downloadchromium_src-a79cd3fb99ff28b50b376cf6ef2c1e5efe6c100b.zip
chromium_src-a79cd3fb99ff28b50b376cf6ef2c1e5efe6c100b.tar.gz
chromium_src-a79cd3fb99ff28b50b376cf6ef2c1e5efe6c100b.tar.bz2
Remove a field that is now unused. This was made obsolete
by the change to eliminate WebRequest::Get/SetExtraData. R=brettw Review URL: http://codereview.chromium.org/113694 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16611 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/webframe_impl.cc15
-rw-r--r--webkit/glue/webframe_impl.h5
2 files changed, 2 insertions, 18 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index ea5fcfb..5843d07 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -363,12 +363,8 @@ WebFrame* WebFrame::RetrieveFrameForCurrentContext() {
}
WebFrameImpl::WebFrameImpl()
-// Don't complain about using "this" in initializer list.
-MSVC_PUSH_DISABLE_WARNING(4355)
- : frame_loader_client_(this),
- scope_matches_factory_(this),
-MSVC_POP_WARNING()
- currently_loading_request_(NULL),
+ : ALLOW_THIS_IN_INITIALIZER_LIST(frame_loader_client_(this)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(scope_matches_factory_(this)),
plugin_delegate_(NULL),
active_match_frame_(NULL),
active_match_index_(-1),
@@ -457,11 +453,6 @@ void WebFrameImpl::InternalLoadRequest(const WebRequest* request,
StopLoading(); // make sure existing activity stops
- // Keep track of the request temporarily. This is effectively a way of
- // passing the request to callbacks that may need it. See
- // WebFrameLoaderClient::createDocumentLoader.
- currently_loading_request_ = request;
-
if (data.isValid()) {
frame_->loader()->load(resource_request, data, false);
if (replace) {
@@ -492,8 +483,6 @@ void WebFrameImpl::InternalLoadRequest(const WebRequest* request,
} else {
frame_->loader()->load(resource_request, false);
}
-
- currently_loading_request_ = NULL;
}
void WebFrameImpl::LoadHTMLString(const std::string& html_text,
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 2d51ed6..8ecd64c 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -298,11 +298,6 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
// ourselves is held while frame_ is valid. See our Closing method.
WebCore::Frame* frame_;
- // This holds the request passed to LoadRequest, for access by the
- // WebFrameLoaderClient. Unfortunately we have no other way to pass this
- // information to him. Only non-NULL during a call to LoadRequest.
- const WebRequest* currently_loading_request_;
-
// Plugins sometimes need to be notified when loads are complete so we keep
// a pointer back to the appropriate plugin.
WebPluginDelegate* plugin_delegate_;