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

Side by Side Diff: Source/core/testing/DummyPageHolder.cpp

Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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/core/loader/FrameLoader.cpp ('k') | Source/core/xml/XSLTProcessor.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) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost() , 0); 74 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost() , 0);
75 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); 75 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize));
76 m_frame->init(); 76 m_frame->init();
77 } 77 }
78 78
79 DummyPageHolder::~DummyPageHolder() 79 DummyPageHolder::~DummyPageHolder()
80 { 80 {
81 m_page->willBeDestroyed(); 81 m_page->willBeDestroyed();
82 m_page.clear(); 82 m_page.clear();
83 #if !ENABLE(OILPAN)
84 ASSERT(m_frame->hasOneRef());
85 #endif
83 m_frame.clear(); 86 m_frame.clear();
84 } 87 }
85 88
86 Page& DummyPageHolder::page() const 89 Page& DummyPageHolder::page() const
87 { 90 {
88 return *m_page; 91 return *m_page;
89 } 92 }
90 93
91 LocalFrame& DummyPageHolder::frame() const 94 LocalFrame& DummyPageHolder::frame() const
92 { 95 {
93 ASSERT(m_frame); 96 ASSERT(m_frame);
94 return *m_frame; 97 return *m_frame;
95 } 98 }
96 99
97 FrameView& DummyPageHolder::frameView() const 100 FrameView& DummyPageHolder::frameView() const
98 { 101 {
99 return *m_frame->view(); 102 return *m_frame->view();
100 } 103 }
101 104
102 Document& DummyPageHolder::document() const 105 Document& DummyPageHolder::document() const
103 { 106 {
104 return *m_frame->domWindow()->document(); 107 return *m_frame->domWindow()->document();
105 } 108 }
106 109
107 } // namespace blink 110 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/core/xml/XSLTProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698