Chromium Code Reviews| 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 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 685 duplicate->render_view()->debug_info(); | 685 duplicate->render_view()->debug_info(); |
| 686 unsigned long duplicate_stack_debug_info[128]; | 686 unsigned long duplicate_stack_debug_info[128]; |
| 687 unsigned long stack_debug_info[128]; | 687 unsigned long stack_debug_info[128]; |
| 688 const int size = debug_info.size() > 128 ? 128 : debug_info.size(); | 688 const int size = debug_info.size() > 128 ? 128 : debug_info.size(); |
| 689 const int duplicate_size = | 689 const int duplicate_size = |
| 690 duplicate_debug_info.size() > 128 ? 128 : duplicate_debug_info.size(); | 690 duplicate_debug_info.size() > 128 ? 128 : duplicate_debug_info.size(); |
| 691 for (int i = 0; i < size; i++) | 691 for (int i = 0; i < size; i++) |
| 692 stack_debug_info[i] = debug_info[i]; | 692 stack_debug_info[i] = debug_info[i]; |
| 693 for (int i = 0; i < duplicate_size; i++) | 693 for (int i = 0; i < duplicate_size; i++) |
| 694 duplicate_stack_debug_info[i] = duplicate_debug_info[i]; | 694 duplicate_stack_debug_info[i] = duplicate_debug_info[i]; |
| 695 (void) stack_debug_info; | |
| 696 (void) duplicate_stack_debug_info; | |
| 697 CHECK(result.second) << "Inserting a duplicate item."; | 695 CHECK(result.second) << "Inserting a duplicate item."; |
| 696 base::debug::Alias(&stack_debug_info); | |
| 697 base::debug::Alias(&duplicate_stack_debug_info); | |
| 698 for (int i = 0; i < size; i++) | |
|
nasko
2015/03/17 22:45:20
nit: I'd add a comment above to explain why this s
| |
| 699 LOG(ERROR) << stack_debug_info[i]; | |
| 700 for (int i = 0; i < duplicate_size; i++) | |
| 701 LOG(ERROR) << duplicate_stack_debug_info[i]; | |
| 698 } | 702 } |
| 699 | 703 |
| 700 RenderThread::Get()->AddRoute(routing_id_, this); | 704 RenderThread::Get()->AddRoute(routing_id_, this); |
| 701 | 705 |
| 702 render_view_->RegisterRenderFrame(this); | 706 render_view_->RegisterRenderFrame(this); |
| 703 | 707 |
| 704 // Everything below subclasses RenderFrameObserver and is automatically | 708 // Everything below subclasses RenderFrameObserver and is automatically |
| 705 // deleted when the RenderFrame gets deleted. | 709 // deleted when the RenderFrame gets deleted. |
| 706 #if defined(OS_ANDROID) | 710 #if defined(OS_ANDROID) |
| 707 new GinJavaBridgeDispatcher(this); | 711 new GinJavaBridgeDispatcher(this); |
| (...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4557 | 4561 |
| 4558 #if defined(ENABLE_BROWSER_CDMS) | 4562 #if defined(ENABLE_BROWSER_CDMS) |
| 4559 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4563 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4560 if (!cdm_manager_) | 4564 if (!cdm_manager_) |
| 4561 cdm_manager_ = new RendererCdmManager(this); | 4565 cdm_manager_ = new RendererCdmManager(this); |
| 4562 return cdm_manager_; | 4566 return cdm_manager_; |
| 4563 } | 4567 } |
| 4564 #endif // defined(ENABLE_BROWSER_CDMS) | 4568 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4565 | 4569 |
| 4566 } // namespace content | 4570 } // namespace content |
| OLD | NEW |