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

Side by Side Diff: components/web_view/frame.cc

Issue 1488853002: Add multiplexing of message pipes in the new EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tsepez review comments Created 5 years 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 | content/browser/browser_child_process_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "components/web_view/frame.h" 5 #include "components/web_view/frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 TRACE_EVENT1("web_view", "Frame::OnCanNavigateFrame", 380 TRACE_EVENT1("web_view", "Frame::OnCanNavigateFrame",
381 "url", url.possibly_invalid_spec()); 381 "url", url.possibly_invalid_spec());
382 382
383 DVLOG(2) << "Frame::OnCanNavigateFrame id=" << id_ 383 DVLOG(2) << "Frame::OnCanNavigateFrame id=" << id_
384 << " equal=" << (AreAppIdsEqual(app_id, app_id_) ? "true" : "false"); 384 << " equal=" << (AreAppIdsEqual(app_id, app_id_) ? "true" : "false");
385 if (AreAppIdsEqual(app_id, app_id_)) { 385 if (AreAppIdsEqual(app_id, app_id_)) {
386 // The app currently rendering the frame will continue rendering it. In this 386 // The app currently rendering the frame will continue rendering it. In this
387 // case we do not use the WindowTreeClient (because the app has a Window 387 // case we do not use the WindowTreeClient (because the app has a Window
388 // already 388 // already
389 // and ends up reusing it). 389 // and ends up reusing it).
390 DCHECK(!window_tree_client.get()); 390 DCHECK(!window_tree_client);
391 ChangeClient(frame_client, user_data.Pass(), window_tree_client.Pass(), 391 ChangeClient(frame_client, user_data.Pass(), window_tree_client.Pass(),
392 app_id, navigation_start_time); 392 app_id, navigation_start_time);
393 } else { 393 } else {
394 waiting_for_on_will_navigate_ack_ = true; 394 waiting_for_on_will_navigate_ack_ = true;
395 DCHECK(window_tree_client.get()); 395 DCHECK(window_tree_client);
396 // TODO(sky): url isn't correct here, it should be a security origin. 396 // TODO(sky): url isn't correct here, it should be a security origin.
397 frame_client_->OnWillNavigate( 397 frame_client_->OnWillNavigate(
398 url.spec(), 398 url.spec(),
399 base::Bind(&Frame::OnWillNavigateAck, base::Unretained(this), 399 base::Bind(&Frame::OnWillNavigateAck, base::Unretained(this),
400 frame_client, base::Passed(&user_data), 400 frame_client, base::Passed(&user_data),
401 base::Passed(&window_tree_client), app_id, 401 base::Passed(&window_tree_client), app_id,
402 navigation_start_time)); 402 navigation_start_time));
403 } 403 }
404 } 404 }
405 405
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 final_update); 597 final_update);
598 } 598 }
599 599
600 void Frame::OnFindInPageSelectionUpdated(int32_t request_id, 600 void Frame::OnFindInPageSelectionUpdated(int32_t request_id,
601 int32_t active_match_ordinal) { 601 int32_t active_match_ordinal) {
602 tree_->delegate_->OnFindInPageSelectionUpdated(request_id, this, 602 tree_->delegate_->OnFindInPageSelectionUpdated(request_id, this,
603 active_match_ordinal); 603 active_match_ordinal);
604 } 604 }
605 605
606 } // namespace web_view 606 } // namespace web_view
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_child_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698