OLD | NEW |
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 m_frame = LocalFrame::create(&m_frameLoaderClient, &m_page->frameHost(), 0); | 67 m_frame = LocalFrame::create(&m_frameLoaderClient, &m_page->frameHost(), 0); |
68 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); | 68 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); |
69 m_frame->init(); | 69 m_frame->init(); |
70 } | 70 } |
71 | 71 |
72 DummyPageHolder::~DummyPageHolder() | 72 DummyPageHolder::~DummyPageHolder() |
73 { | 73 { |
74 m_page->willBeDestroyed(); | 74 m_page->willBeDestroyed(); |
75 m_page.clear(); | 75 m_page.clear(); |
76 #if !ENABLE(OILPAN) | 76 #if ENABLE(OILPAN) |
| 77 m_frame->willBeDestroyed(); |
| 78 #else |
77 ASSERT(m_frame->hasOneRef()); | 79 ASSERT(m_frame->hasOneRef()); |
78 #endif | 80 #endif |
79 m_frame.clear(); | 81 m_frame.clear(); |
80 } | 82 } |
81 | 83 |
82 Page& DummyPageHolder::page() const | 84 Page& DummyPageHolder::page() const |
83 { | 85 { |
84 return *m_page; | 86 return *m_page; |
85 } | 87 } |
86 | 88 |
87 LocalFrame& DummyPageHolder::frame() const | 89 LocalFrame& DummyPageHolder::frame() const |
88 { | 90 { |
89 return *m_frame; | 91 return *m_frame; |
90 } | 92 } |
91 | 93 |
92 FrameView& DummyPageHolder::frameView() const | 94 FrameView& DummyPageHolder::frameView() const |
93 { | 95 { |
94 return *m_frame->view(); | 96 return *m_frame->view(); |
95 } | 97 } |
96 | 98 |
97 Document& DummyPageHolder::document() const | 99 Document& DummyPageHolder::document() const |
98 { | 100 { |
99 return *m_frame->domWindow()->document(); | 101 return *m_frame->domWindow()->document(); |
100 } | 102 } |
101 | 103 |
102 } // namespace blink | 104 } // namespace blink |
OLD | NEW |