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

Side by Side Diff: Source/core/inspector/InspectorOverlay.cpp

Issue 339493002: Remove redundant calls to FrameLoader::frameDetached(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix layout tests. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/page/Page.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 } 767 }
768 768
769 bool InspectorOverlay::getBoxModel(Node* node, Vector<FloatQuad>* quads) 769 bool InspectorOverlay::getBoxModel(Node* node, Vector<FloatQuad>* quads)
770 { 770 {
771 return buildNodeQuads(node, *quads); 771 return buildNodeQuads(node, *quads);
772 } 772 }
773 773
774 void InspectorOverlay::freePage() 774 void InspectorOverlay::freePage()
775 { 775 {
776 if (m_overlayPage) { 776 if (m_overlayPage) {
777 // FIXME: This logic is duplicated in SVGImage and WebViewImpl. Perhaps it can be combined
778 // into Page's destructor.
779 toLocalFrame(m_overlayPage->mainFrame())->loader().frameDetached();
780 m_overlayPage->willBeDestroyed(); 777 m_overlayPage->willBeDestroyed();
781 m_overlayPage.clear(); 778 m_overlayPage.clear();
782 } 779 }
783 m_overlayChromeClient.clear(); 780 m_overlayChromeClient.clear();
784 m_timer.stop(); 781 m_timer.stop();
785 782
786 // This will clear internal structures and issue update to the client. Safe to call last. 783 // This will clear internal structures and issue update to the client. Safe to call last.
787 hideHighlight(); 784 hideHighlight();
788 } 785 }
789 786
790 void InspectorOverlay::startedRecordingProfile() 787 void InspectorOverlay::startedRecordingProfile()
791 { 788 {
792 if (!m_activeProfilerCount++) 789 if (!m_activeProfilerCount++)
793 freePage(); 790 freePage();
794 } 791 }
795 792
796 } // namespace WebCore 793 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698