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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1016183002: Revert of Store the callstack of the IPC sender of ViewMsg_New (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « content/common/view_messages.h ('k') | content/renderer/render_view_impl.h » ('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 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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 geolocation_dispatcher_(NULL), 669 geolocation_dispatcher_(NULL),
670 push_messaging_dispatcher_(NULL), 670 push_messaging_dispatcher_(NULL),
671 presentation_dispatcher_(NULL), 671 presentation_dispatcher_(NULL),
672 screen_orientation_dispatcher_(NULL), 672 screen_orientation_dispatcher_(NULL),
673 manifest_manager_(NULL), 673 manifest_manager_(NULL),
674 accessibility_mode_(AccessibilityModeOff), 674 accessibility_mode_(AccessibilityModeOff),
675 renderer_accessibility_(NULL), 675 renderer_accessibility_(NULL),
676 weak_factory_(this) { 676 weak_factory_(this) {
677 std::pair<RoutingIDFrameMap::iterator, bool> result = 677 std::pair<RoutingIDFrameMap::iterator, bool> result =
678 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 678 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
679 if (!result.second) { 679 CHECK(result.second) << "Inserting a duplicate item.";
680 // TODO(lfg): Temporary. We're about to force a crash, so save the debug
681 // info on the stack so we can recover it from the crash dumps.
682 RenderFrameImpl* duplicate = result.first->second;
683 const std::vector<unsigned long>& debug_info = render_view->debug_info();
684 const std::vector<unsigned long>& duplicate_debug_info =
685 duplicate->render_view()->debug_info();
686 unsigned long duplicate_stack_debug_info[128];
687 unsigned long stack_debug_info[128];
688 const int size = debug_info.size() > 128 ? 128 : debug_info.size();
689 const int duplicate_size =
690 duplicate_debug_info.size() > 128 ? 128 : duplicate_debug_info.size();
691 for (int i = 0; i < size; i++)
692 stack_debug_info[i] = debug_info[i];
693 for (int i = 0; i < duplicate_size; i++)
694 duplicate_stack_debug_info[i] = duplicate_debug_info[i];
695 CHECK(result.second) << "Inserting a duplicate item.";
696 // Make sure the variable is stored on the stack and use it so that the
697 // compiler won't optimize it out.
698 base::debug::Alias(&stack_debug_info);
699 base::debug::Alias(&duplicate_stack_debug_info);
700 for (int i = 0; i < size; i++)
701 LOG(ERROR) << stack_debug_info[i];
702 for (int i = 0; i < duplicate_size; i++)
703 LOG(ERROR) << duplicate_stack_debug_info[i];
704 }
705 680
706 RenderThread::Get()->AddRoute(routing_id_, this); 681 RenderThread::Get()->AddRoute(routing_id_, this);
707 682
708 render_view_->RegisterRenderFrame(this); 683 render_view_->RegisterRenderFrame(this);
709 684
710 // Everything below subclasses RenderFrameObserver and is automatically 685 // Everything below subclasses RenderFrameObserver and is automatically
711 // deleted when the RenderFrame gets deleted. 686 // deleted when the RenderFrame gets deleted.
712 #if defined(OS_ANDROID) 687 #if defined(OS_ANDROID)
713 new GinJavaBridgeDispatcher(this); 688 new GinJavaBridgeDispatcher(this);
714 #endif 689 #endif
(...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after
4564 4539
4565 #if defined(ENABLE_BROWSER_CDMS) 4540 #if defined(ENABLE_BROWSER_CDMS)
4566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4541 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4567 if (!cdm_manager_) 4542 if (!cdm_manager_)
4568 cdm_manager_ = new RendererCdmManager(this); 4543 cdm_manager_ = new RendererCdmManager(this);
4569 return cdm_manager_; 4544 return cdm_manager_;
4570 } 4545 }
4571 #endif // defined(ENABLE_BROWSER_CDMS) 4546 #endif // defined(ENABLE_BROWSER_CDMS)
4572 4547
4573 } // namespace content 4548 } // namespace content
OLDNEW
« no previous file with comments | « content/common/view_messages.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698