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

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

Issue 117493002: Invert the owning relationship between WebFrame and Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | « Source/bindings/v8/ScriptController.cpp ('k') | Source/core/loader/EmptyClients.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 /* 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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 update(); 674 update();
675 } 675 }
676 676
677 bool InspectorOverlay::getBoxModel(Node* node, Vector<FloatQuad>* quads) 677 bool InspectorOverlay::getBoxModel(Node* node, Vector<FloatQuad>* quads)
678 { 678 {
679 return buildNodeQuads(node, *quads); 679 return buildNodeQuads(node, *quads);
680 } 680 }
681 681
682 void InspectorOverlay::freePage() 682 void InspectorOverlay::freePage()
683 { 683 {
684 m_overlayPage.clear(); 684 if (m_overlayPage) {
685 // FIXME: This logic is duplicated in SVGImage and WebViewImpl. Perhaps it can be combined
686 // into Page's destructor.
687 m_overlayPage->mainFrame()->loader().frameDetached();
688 m_overlayPage.clear();
689 }
685 m_overlayChromeClient.clear(); 690 m_overlayChromeClient.clear();
686 m_timer.stop(); 691 m_timer.stop();
687 } 692 }
688 693
689 void InspectorOverlay::startedRecordingProfile() 694 void InspectorOverlay::startedRecordingProfile()
690 { 695 {
691 if (!m_activeProfilerCount++) 696 if (!m_activeProfilerCount++)
692 freePage(); 697 freePage();
693 } 698 }
694 699
695 } // namespace WebCore 700 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698