Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: Source/web/WebLocalFrameImpl.h

Issue 514603004: Make WebFrame::isLoading() local-only and map it to load event completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 virtual void loadRequest(const WebURLRequest&) OVERRIDE; 134 virtual void loadRequest(const WebURLRequest&) OVERRIDE;
135 virtual void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebU RLRequest::CachePolicy) OVERRIDE; 135 virtual void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebU RLRequest::CachePolicy) OVERRIDE;
136 virtual void loadData( 136 virtual void loadData(
137 const WebData&, const WebString& mimeType, const WebString& textEncoding , 137 const WebData&, const WebString& mimeType, const WebString& textEncoding ,
138 const WebURL& baseURL, const WebURL& unreachableURL, bool replace) OVERR IDE; 138 const WebURL& baseURL, const WebURL& unreachableURL, bool replace) OVERR IDE;
139 virtual void loadHTMLString( 139 virtual void loadHTMLString(
140 const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL , 140 const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL ,
141 bool replace) OVERRIDE; 141 bool replace) OVERRIDE;
142 virtual void sendPings(const WebNode& linkNode, const WebURL& destinationURL ) OVERRIDE; 142 virtual void sendPings(const WebNode& linkNode, const WebURL& destinationURL ) OVERRIDE;
143 virtual bool isLoading() const OVERRIDE; 143 virtual bool isLoading() const OVERRIDE;
144 virtual bool isResourceLoadInProgress() const OVERRIDE;
144 virtual void stopLoading() OVERRIDE; 145 virtual void stopLoading() OVERRIDE;
145 virtual WebDataSource* provisionalDataSource() const OVERRIDE; 146 virtual WebDataSource* provisionalDataSource() const OVERRIDE;
146 virtual WebDataSource* dataSource() const OVERRIDE; 147 virtual WebDataSource* dataSource() const OVERRIDE;
147 virtual void enableViewSourceMode(bool enable) OVERRIDE; 148 virtual void enableViewSourceMode(bool enable) OVERRIDE;
148 virtual bool isViewSourceModeEnabled() const OVERRIDE; 149 virtual bool isViewSourceModeEnabled() const OVERRIDE;
149 virtual void setReferrerForRequest(WebURLRequest&, const WebURL& referrer) O VERRIDE; 150 virtual void setReferrerForRequest(WebURLRequest&, const WebURL& referrer) O VERRIDE;
150 virtual void dispatchWillSendRequest(WebURLRequest&) OVERRIDE; 151 virtual void dispatchWillSendRequest(WebURLRequest&) OVERRIDE;
151 virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&) OVERRIDE; 152 virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&) OVERRIDE;
152 virtual unsigned unloadListenerCount() const OVERRIDE; 153 virtual unsigned unloadListenerCount() const OVERRIDE;
153 virtual void replaceSelection(const WebString&) OVERRIDE; 154 virtual void replaceSelection(const WebString&) OVERRIDE;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 UserMediaClientImpl m_userMediaClientImpl; 357 UserMediaClientImpl m_userMediaClientImpl;
357 358
358 OwnPtrWillBePersistent<GeolocationClientProxy> m_geolocationClientProxy; 359 OwnPtrWillBePersistent<GeolocationClientProxy> m_geolocationClientProxy;
359 }; 360 };
360 361
361 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 362 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
362 363
363 } // namespace blink 364 } // namespace blink
364 365
365 #endif 366 #endif
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698