OLD | NEW |
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 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 void WebViewHelper::reset() | 140 void WebViewHelper::reset() |
141 { | 141 { |
142 if (m_webView) { | 142 if (m_webView) { |
143 m_webView->close(); | 143 m_webView->close(); |
144 m_webView = 0; | 144 m_webView = 0; |
145 } | 145 } |
146 } | 146 } |
147 | 147 |
148 WebFrame* TestWebFrameClient::createChildFrame(WebFrame* parent, const WebString
& frameName) | 148 WebFrame* TestWebFrameClient::createChildFrame(WebFrame* parent, const WebString
& frameName) |
149 { | 149 { |
150 return WebFrame::create(this); | 150 WebFrame* frame = WebFrame::create(this); |
| 151 parent->appendChild(frame); |
| 152 return frame; |
151 } | 153 } |
152 | 154 |
153 void TestWebFrameClient::frameDetached(WebFrame* frame) | 155 void TestWebFrameClient::frameDetached(WebFrame* frame) |
154 { | 156 { |
| 157 if (frame->parent()) |
| 158 frame->parent()->removeChild(frame); |
155 frame->close(); | 159 frame->close(); |
156 } | 160 } |
157 | 161 |
158 | 162 |
159 } // namespace FrameTestHelpers | 163 } // namespace FrameTestHelpers |
160 } // namespace blink | 164 } // namespace blink |
OLD | NEW |