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 "web/WebRemoteFrameImpl.h" | 5 #include "web/WebRemoteFrameImpl.h" |
6 | 6 |
7 #include "core/frame/FrameView.h" | 7 #include "core/frame/FrameView.h" |
8 #include "core/frame/Settings.h" | 8 #include "core/frame/Settings.h" |
9 #include "core/html/HTMLFrameOwnerElement.h" | 9 #include "core/html/HTMLFrameOwnerElement.h" |
| 10 #include "core/layout/LayoutObject.h" |
10 #include "core/page/Page.h" | 11 #include "core/page/Page.h" |
11 #include "platform/heap/Handle.h" | 12 #include "platform/heap/Handle.h" |
12 #include "public/platform/WebFloatRect.h" | 13 #include "public/platform/WebFloatRect.h" |
13 #include "public/platform/WebRect.h" | 14 #include "public/platform/WebRect.h" |
14 #include "public/web/WebDocument.h" | 15 #include "public/web/WebDocument.h" |
15 #include "public/web/WebFrameOwnerProperties.h" | 16 #include "public/web/WebFrameOwnerProperties.h" |
16 #include "public/web/WebPerformance.h" | 17 #include "public/web/WebPerformance.h" |
17 #include "public/web/WebRange.h" | 18 #include "public/web/WebRange.h" |
18 #include "public/web/WebTreeScopeType.h" | 19 #include "public/web/WebTreeScopeType.h" |
19 #include "web/RemoteBridgeFrameOwner.h" | 20 #include "web/RemoteBridgeFrameOwner.h" |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
808 void WebRemoteFrameImpl::didStopLoading() | 809 void WebRemoteFrameImpl::didStopLoading() |
809 { | 810 { |
810 frame()->setIsLoading(false); | 811 frame()->setIsLoading(false); |
811 if (parent() && parent()->isWebLocalFrame()) { | 812 if (parent() && parent()->isWebLocalFrame()) { |
812 WebLocalFrameImpl* parentFrame = | 813 WebLocalFrameImpl* parentFrame = |
813 toWebLocalFrameImpl(parent()->toWebLocalFrame()); | 814 toWebLocalFrameImpl(parent()->toWebLocalFrame()); |
814 parentFrame->frame()->loader().checkCompleted(); | 815 parentFrame->frame()->loader().checkCompleted(); |
815 } | 816 } |
816 } | 817 } |
817 | 818 |
| 819 bool WebRemoteFrameImpl::ignoredForHittest() const |
| 820 { |
| 821 HTMLFrameOwnerElement* owner = frame()->deprecatedLocalOwner(); |
| 822 return owner ? owner->layoutObject()->style()->pointerEvents() == PE_NONE :
false; |
| 823 } |
| 824 |
818 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli
ent* client) | 825 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli
ent* client) |
819 : WebRemoteFrame(scope) | 826 : WebRemoteFrame(scope) |
820 , m_frameClient(RemoteFrameClientImpl::create(this)) | 827 , m_frameClient(RemoteFrameClientImpl::create(this)) |
821 , m_client(client) | 828 , m_client(client) |
822 #if ENABLE(OILPAN) | 829 #if ENABLE(OILPAN) |
823 , m_selfKeepAlive(this) | 830 , m_selfKeepAlive(this) |
824 #endif | 831 #endif |
825 { | 832 { |
826 } | 833 } |
827 | 834 |
828 } // namespace blink | 835 } // namespace blink |
OLD | NEW |