| 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/layout/LayoutObject.h" |
| (...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 806 if (parent() && parent()->isWebLocalFrame()) { | 806 if (parent() && parent()->isWebLocalFrame()) { |
| 807 WebLocalFrameImpl* parentFrame = | 807 WebLocalFrameImpl* parentFrame = |
| 808 toWebLocalFrameImpl(parent()->toWebLocalFrame()); | 808 toWebLocalFrameImpl(parent()->toWebLocalFrame()); |
| 809 parentFrame->frame()->loader().checkCompleted(); | 809 parentFrame->frame()->loader().checkCompleted(); |
| 810 } | 810 } |
| 811 } | 811 } |
| 812 | 812 |
| 813 bool WebRemoteFrameImpl::isIgnoredForHitTest() const | 813 bool WebRemoteFrameImpl::isIgnoredForHitTest() const |
| 814 { | 814 { |
| 815 HTMLFrameOwnerElement* owner = frame()->deprecatedLocalOwner(); | 815 HTMLFrameOwnerElement* owner = frame()->deprecatedLocalOwner(); |
| 816 return owner ? owner->layoutObject()->style()->pointerEvents() == PE_NONE :
false; | 816 if (!owner || !owner->layoutObject()) |
| 817 return false; |
| 818 return owner->layoutObject()->style()->pointerEvents() == PE_NONE; |
| 817 } | 819 } |
| 818 | 820 |
| 819 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli
ent* client) | 821 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, WebRemoteFrameCli
ent* client) |
| 820 : WebRemoteFrame(scope) | 822 : WebRemoteFrame(scope) |
| 821 , m_frameClient(RemoteFrameClientImpl::create(this)) | 823 , m_frameClient(RemoteFrameClientImpl::create(this)) |
| 822 , m_client(client) | 824 , m_client(client) |
| 823 #if ENABLE(OILPAN) | 825 #if ENABLE(OILPAN) |
| 824 , m_selfKeepAlive(this) | 826 , m_selfKeepAlive(this) |
| 825 #endif | 827 #endif |
| 826 { | 828 { |
| 827 } | 829 } |
| 828 | 830 |
| 829 } // namespace blink | 831 } // namespace blink |
| OLD | NEW |