| 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 668 geolocation_dispatcher_(NULL), | 668 geolocation_dispatcher_(NULL), |
| 669 push_messaging_dispatcher_(NULL), | 669 push_messaging_dispatcher_(NULL), |
| 670 presentation_dispatcher_(NULL), | 670 presentation_dispatcher_(NULL), |
| 671 screen_orientation_dispatcher_(NULL), | 671 screen_orientation_dispatcher_(NULL), |
| 672 manifest_manager_(NULL), | 672 manifest_manager_(NULL), |
| 673 accessibility_mode_(AccessibilityModeOff), | 673 accessibility_mode_(AccessibilityModeOff), |
| 674 renderer_accessibility_(NULL), | 674 renderer_accessibility_(NULL), |
| 675 weak_factory_(this) { | 675 weak_factory_(this) { |
| 676 std::pair<RoutingIDFrameMap::iterator, bool> result = | 676 std::pair<RoutingIDFrameMap::iterator, bool> result = |
| 677 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); | 677 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); |
| 678 CHECK(result.second) << "Inserting a duplicate item."; | 678 if (!result.second) { |
| 679 // TODO(lfg): Temporary. We're about to force a crash, so save the debug |
| 680 // info on the stack so we can recover it from the crash dumps. |
| 681 RenderFrameImpl* duplicate = result.first->second; |
| 682 const std::vector<unsigned long>& debug_info = render_view->debug_info(); |
| 683 const std::vector<unsigned long>& duplicate_debug_info = |
| 684 duplicate->render_view()->debug_info(); |
| 685 unsigned long duplicate_stack_debug_info[128]; |
| 686 unsigned long stack_debug_info[128]; |
| 687 const int size = debug_info.size() > 128 ? 128 : debug_info.size(); |
| 688 const int duplicate_size = |
| 689 duplicate_debug_info.size() > 128 ? 128 : duplicate_debug_info.size(); |
| 690 for (int i = 0; i < size; i++) |
| 691 stack_debug_info[i] = debug_info[i]; |
| 692 for (int i = 0; i < duplicate_size; i++) |
| 693 duplicate_stack_debug_info[i] = duplicate_debug_info[i]; |
| 694 (void) stack_debug_info; |
| 695 (void) duplicate_stack_debug_info; |
| 696 CHECK(result.second) << "Inserting a duplicate item."; |
| 697 } |
| 679 | 698 |
| 680 RenderThread::Get()->AddRoute(routing_id_, this); | 699 RenderThread::Get()->AddRoute(routing_id_, this); |
| 681 | 700 |
| 682 render_view_->RegisterRenderFrame(this); | 701 render_view_->RegisterRenderFrame(this); |
| 683 | 702 |
| 684 // Everything below subclasses RenderFrameObserver and is automatically | 703 // Everything below subclasses RenderFrameObserver and is automatically |
| 685 // deleted when the RenderFrame gets deleted. | 704 // deleted when the RenderFrame gets deleted. |
| 686 #if defined(OS_ANDROID) | 705 #if defined(OS_ANDROID) |
| 687 new GinJavaBridgeDispatcher(this); | 706 new GinJavaBridgeDispatcher(this); |
| 688 #endif | 707 #endif |
| (...skipping 3834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4523 | 4542 |
| 4524 #if defined(ENABLE_BROWSER_CDMS) | 4543 #if defined(ENABLE_BROWSER_CDMS) |
| 4525 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4544 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4526 if (!cdm_manager_) | 4545 if (!cdm_manager_) |
| 4527 cdm_manager_ = new RendererCdmManager(this); | 4546 cdm_manager_ = new RendererCdmManager(this); |
| 4528 return cdm_manager_; | 4547 return cdm_manager_; |
| 4529 } | 4548 } |
| 4530 #endif // defined(ENABLE_BROWSER_CDMS) | 4549 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4531 | 4550 |
| 4532 } // namespace content | 4551 } // namespace content |
| OLD | NEW |