OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "public/web/WebFrame.h" | 6 #include "public/web/WebFrame.h" |
7 | 7 |
8 #include "bindings/core/v8/WindowProxyManager.h" | 8 #include "bindings/core/v8/WindowProxyManager.h" |
9 #include "core/frame/FrameHost.h" | 9 #include "core/frame/FrameHost.h" |
10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 | 278 |
279 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement) | 279 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement) |
280 { | 280 { |
281 Element* element = PassRefPtrWillBeRawPtr<Element>(webElement).get(); | 281 Element* element = PassRefPtrWillBeRawPtr<Element>(webElement).get(); |
282 | 282 |
283 if (!isHTMLFrameElementBase(element)) | 283 if (!isHTMLFrameElementBase(element)) |
284 return nullptr; | 284 return nullptr; |
285 return fromFrame(toHTMLFrameElementBase(element)->contentFrame()); | 285 return fromFrame(toHTMLFrameElementBase(element)->contentFrame()); |
286 } | 286 } |
287 | 287 |
| 288 bool WebFrame::isLoading() const |
| 289 { |
| 290 if (Frame* frame = toCoreFrame(this)) |
| 291 return frame->isLoading(); |
| 292 return false; |
| 293 } |
| 294 |
288 WebFrame* WebFrame::fromFrame(Frame* frame) | 295 WebFrame* WebFrame::fromFrame(Frame* frame) |
289 { | 296 { |
290 if (!frame) | 297 if (!frame) |
291 return 0; | 298 return 0; |
292 | 299 |
293 if (frame->isLocalFrame()) | 300 if (frame->isLocalFrame()) |
294 return WebLocalFrameImpl::fromFrame(toLocalFrame(*frame)); | 301 return WebLocalFrameImpl::fromFrame(toLocalFrame(*frame)); |
295 return WebRemoteFrameImpl::fromFrame(toRemoteFrame(*frame)); | 302 return WebRemoteFrameImpl::fromFrame(toRemoteFrame(*frame)); |
296 } | 303 } |
297 | 304 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ | 366 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ |
360 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } | 367 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } |
361 | 368 |
362 DEFINE_VISITOR_METHOD(Visitor*) | 369 DEFINE_VISITOR_METHOD(Visitor*) |
363 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 370 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
364 | 371 |
365 #undef DEFINE_VISITOR_METHOD | 372 #undef DEFINE_VISITOR_METHOD |
366 #endif | 373 #endif |
367 | 374 |
368 } // namespace blink | 375 } // namespace blink |
OLD | NEW |