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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2942623003: Make WebLocalFrameImpl::Load() to reset active match (Closed)
Patch Set: 2017-06-15T14:26:20 Created 3 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebFrameTest.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 2072 matching lines...) Expand 10 before | Expand all | Expand 10 after
2083 DCHECK(GetFrame()); 2083 DCHECK(GetFrame());
2084 DCHECK(!request.IsNull()); 2084 DCHECK(!request.IsNull());
2085 const ResourceRequest& resource_request = request.ToResourceRequest(); 2085 const ResourceRequest& resource_request = request.ToResourceRequest();
2086 2086
2087 if (resource_request.Url().ProtocolIs("javascript") && 2087 if (resource_request.Url().ProtocolIs("javascript") &&
2088 web_frame_load_type == WebFrameLoadType::kStandard) { 2088 web_frame_load_type == WebFrameLoadType::kStandard) {
2089 LoadJavaScriptURL(resource_request.Url()); 2089 LoadJavaScriptURL(resource_request.Url());
2090 return; 2090 return;
2091 } 2091 }
2092 2092
2093 if (text_finder_)
2094 text_finder_->ClearActiveFindMatch();
2095
2093 FrameLoadRequest frame_request = FrameLoadRequest(nullptr, resource_request); 2096 FrameLoadRequest frame_request = FrameLoadRequest(nullptr, resource_request);
2094 if (is_client_redirect) 2097 if (is_client_redirect)
2095 frame_request.SetClientRedirect(ClientRedirectPolicy::kClientRedirect); 2098 frame_request.SetClientRedirect(ClientRedirectPolicy::kClientRedirect);
2096 HistoryItem* history_item = item; 2099 HistoryItem* history_item = item;
2097 GetFrame()->Loader().Load( 2100 GetFrame()->Loader().Load(
2098 frame_request, static_cast<FrameLoadType>(web_frame_load_type), 2101 frame_request, static_cast<FrameLoadType>(web_frame_load_type),
2099 history_item, static_cast<HistoryLoadType>(web_history_load_type)); 2102 history_item, static_cast<HistoryLoadType>(web_history_load_type));
2100 } 2103 }
2101 2104
2102 void WebLocalFrameImpl::LoadData(const WebData& data, 2105 void WebLocalFrameImpl::LoadData(const WebData& data,
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
2629 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const { 2632 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const {
2630 return *text_checker_client_; 2633 return *text_checker_client_;
2631 } 2634 }
2632 2635
2633 void WebLocalFrameImpl::SetTextCheckClient( 2636 void WebLocalFrameImpl::SetTextCheckClient(
2634 WebTextCheckClient* text_check_client) { 2637 WebTextCheckClient* text_check_client) {
2635 text_check_client_ = text_check_client; 2638 text_check_client_ = text_check_client;
2636 } 2639 }
2637 2640
2638 } // namespace blink 2641 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698