OLD | NEW |
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/html_viewer/html_frame.h" | 5 #include "components/html_viewer/html_frame.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 } | 419 } |
420 | 420 |
421 bool HTMLFrame::hasPendingNavigation(blink::WebLocalFrame* frame) { | 421 bool HTMLFrame::hasPendingNavigation(blink::WebLocalFrame* frame) { |
422 return pending_navigation_; | 422 return pending_navigation_; |
423 } | 423 } |
424 | 424 |
425 void HTMLFrame::didHandleOnloadEvents(blink::WebLocalFrame* frame) { | 425 void HTMLFrame::didHandleOnloadEvents(blink::WebLocalFrame* frame) { |
426 DVLOG(2) << "XXX HTMLFrame::didHandleOnloadEvents id=" << id_; | 426 DVLOG(2) << "XXX HTMLFrame::didHandleOnloadEvents id=" << id_; |
427 static bool recorded = false; | 427 static bool recorded = false; |
428 if (!recorded && startup_performance_data_collector_) { | 428 if (!recorded && startup_performance_data_collector_) { |
429 startup_performance_data_collector_->SetFirstWebContentsMainFrameLoadTime( | 429 startup_performance_data_collector_->SetFirstWebContentsMainFrameLoadTicks( |
430 base::Time::Now().ToInternalValue()); | 430 base::TimeTicks::Now().ToInternalValue()); |
431 recorded = true; | 431 recorded = true; |
432 } | 432 } |
433 } | 433 } |
434 | 434 |
435 void HTMLFrame::didAddMessageToConsole(const blink::WebConsoleMessage& message, | 435 void HTMLFrame::didAddMessageToConsole(const blink::WebConsoleMessage& message, |
436 const blink::WebString& source_name, | 436 const blink::WebString& source_name, |
437 unsigned source_line, | 437 unsigned source_line, |
438 const blink::WebString& stack_trace) { | 438 const blink::WebString& stack_trace) { |
439 VLOG(1) << "[" << source_name.utf8() << "(" << source_line << ")] " | 439 VLOG(1) << "[" << source_name.utf8() << "(" << source_line << ")] " |
440 << message.text.utf8(); | 440 << message.text.utf8(); |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1036 | 1036 |
1037 if (!surface_layer_) | 1037 if (!surface_layer_) |
1038 return; | 1038 return; |
1039 | 1039 |
1040 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), | 1040 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), |
1041 global_state()->device_pixel_ratio(), | 1041 global_state()->device_pixel_ratio(), |
1042 owned_window_->window()->bounds().size()); | 1042 owned_window_->window()->bounds().size()); |
1043 } | 1043 } |
1044 | 1044 |
1045 } // namespace mojo | 1045 } // namespace mojo |
OLD | NEW |