OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
583 blink::WebHistoryCommitType commit_type) override; | 583 blink::WebHistoryCommitType commit_type) override; |
584 void didFinishLoad(blink::WebLocalFrame* frame) override; | 584 void didFinishLoad(blink::WebLocalFrame* frame) override; |
585 void didNavigateWithinPage(blink::WebLocalFrame* frame, | 585 void didNavigateWithinPage(blink::WebLocalFrame* frame, |
586 const blink::WebHistoryItem& item, | 586 const blink::WebHistoryItem& item, |
587 blink::WebHistoryCommitType commit_type, | 587 blink::WebHistoryCommitType commit_type, |
588 bool content_initiated) override; | 588 bool content_initiated) override; |
589 void didUpdateCurrentHistoryItem() override; | 589 void didUpdateCurrentHistoryItem() override; |
590 void didChangeThemeColor() override; | 590 void didChangeThemeColor() override; |
591 void dispatchLoad() override; | 591 void dispatchLoad() override; |
592 blink::WebEffectiveConnectionType getEffectiveConnectionType() override; | 592 blink::WebEffectiveConnectionType getEffectiveConnectionType() override; |
593 void abortClientNavigation() override; | |
593 void didChangeSelection(bool is_empty_selection) override; | 594 void didChangeSelection(bool is_empty_selection) override; |
594 bool handleCurrentKeyboardEvent() override; | 595 bool handleCurrentKeyboardEvent() override; |
595 blink::WebColorChooser* createColorChooser( | 596 blink::WebColorChooser* createColorChooser( |
596 blink::WebColorChooserClient* client, | 597 blink::WebColorChooserClient* client, |
597 const blink::WebColor& initial_color, | 598 const blink::WebColor& initial_color, |
598 const blink::WebVector<blink::WebColorSuggestion>& suggestions) override; | 599 const blink::WebVector<blink::WebColorSuggestion>& suggestions) override; |
599 void runModalAlertDialog(const blink::WebString& message) override; | 600 void runModalAlertDialog(const blink::WebString& message) override; |
600 bool runModalConfirmDialog(const blink::WebString& message) override; | 601 bool runModalConfirmDialog(const blink::WebString& message) override; |
601 bool runModalPromptDialog(const blink::WebString& message, | 602 bool runModalPromptDialog(const blink::WebString& message, |
602 const blink::WebString& default_value, | 603 const blink::WebString& default_value, |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
889 const FrameMsg_TextTrackSettings_Params& params); | 890 const FrameMsg_TextTrackSettings_Params& params); |
890 void OnPostMessageEvent(const FrameMsg_PostMessage_Params& params); | 891 void OnPostMessageEvent(const FrameMsg_PostMessage_Params& params); |
891 void OnCommitNavigation(const ResourceResponseHead& response, | 892 void OnCommitNavigation(const ResourceResponseHead& response, |
892 const GURL& stream_url, | 893 const GURL& stream_url, |
893 const CommonNavigationParams& common_params, | 894 const CommonNavigationParams& common_params, |
894 const RequestNavigationParams& request_params); | 895 const RequestNavigationParams& request_params); |
895 void OnFailedNavigation(const CommonNavigationParams& common_params, | 896 void OnFailedNavigation(const CommonNavigationParams& common_params, |
896 const RequestNavigationParams& request_params, | 897 const RequestNavigationParams& request_params, |
897 bool has_stale_copy_in_cache, | 898 bool has_stale_copy_in_cache, |
898 int error_code); | 899 int error_code); |
900 void OnDroppedNavigation(int navigation_id); | |
899 void OnGetSavableResourceLinks(); | 901 void OnGetSavableResourceLinks(); |
900 void OnGetSerializedHtmlWithLocalLinks( | 902 void OnGetSerializedHtmlWithLocalLinks( |
901 const std::map<GURL, base::FilePath>& url_to_local_path, | 903 const std::map<GURL, base::FilePath>& url_to_local_path, |
902 const std::map<int, base::FilePath>& frame_routing_id_to_local_path); | 904 const std::map<int, base::FilePath>& frame_routing_id_to_local_path); |
903 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params); | 905 void OnSerializeAsMHTML(const FrameMsg_SerializeAsMHTML_Params& params); |
904 void OnFind(int request_id, | 906 void OnFind(int request_id, |
905 const base::string16& search_text, | 907 const base::string16& search_text, |
906 const blink::WebFindOptions& options); | 908 const blink::WebFindOptions& options); |
907 void OnClearActiveFindMatch(); | 909 void OnClearActiveFindMatch(); |
908 void OnStopFinding(StopFindAction action); | 910 void OnStopFinding(StopFindAction action); |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1417 client_redirect(info.isClientRedirect), | 1419 client_redirect(info.isClientRedirect), |
1418 cache_disabled(info.isCacheDisabled), | 1420 cache_disabled(info.isCacheDisabled), |
1419 form(info.form) {} | 1421 form(info.form) {} |
1420 }; | 1422 }; |
1421 | 1423 |
1422 // PlzNavigate: Contains information about a pending navigation to be sent to | 1424 // PlzNavigate: Contains information about a pending navigation to be sent to |
1423 // the browser. This state is allocated in decidePolicyForNavigation() and | 1425 // the browser. This state is allocated in decidePolicyForNavigation() and |
1424 // is used and released in didStartProvisionalLoad(). | 1426 // is used and released in didStartProvisionalLoad(). |
1425 std::unique_ptr<PendingNavigationInfo> pending_navigation_info_; | 1427 std::unique_ptr<PendingNavigationInfo> pending_navigation_info_; |
1426 | 1428 |
1429 // PlzNavigate | |
1430 // An id to identify the last navigation sent to the browser. | |
1431 int navigation_id_ = 0; | |
nasko
2017/03/16 21:23:14
I'd like to hear what Charlie thinks about this ap
clamy
2017/03/17 15:19:11
TBH I'm not super happy about introducing an id, b
| |
1432 | |
1427 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1433 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1428 | 1434 |
1429 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1435 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1430 }; | 1436 }; |
1431 | 1437 |
1432 } // namespace content | 1438 } // namespace content |
1433 | 1439 |
1434 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1440 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |