| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 | 974 |
| 975 static LocalFrame* subframeForTargetNode(Node* node) | 975 static LocalFrame* subframeForTargetNode(Node* node) |
| 976 { | 976 { |
| 977 if (!node) | 977 if (!node) |
| 978 return nullptr; | 978 return nullptr; |
| 979 | 979 |
| 980 RenderObject* renderer = node->renderer(); | 980 RenderObject* renderer = node->renderer(); |
| 981 if (!renderer || !renderer->isRenderPart()) | 981 if (!renderer || !renderer->isRenderPart()) |
| 982 return nullptr; | 982 return nullptr; |
| 983 | 983 |
| 984 // FIXME: This explicit check is needed only until RemoteFrames have RemoteF
rameViews. | |
| 985 if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFra
me() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary()) | |
| 986 return nullptr; | |
| 987 | |
| 988 Widget* widget = toRenderPart(renderer)->widget(); | 984 Widget* widget = toRenderPart(renderer)->widget(); |
| 989 if (!widget || !widget->isFrameView()) | 985 if (!widget || !widget->isFrameView()) |
| 990 return nullptr; | 986 return nullptr; |
| 991 | 987 |
| 992 return &toFrameView(widget)->frame(); | 988 return &toFrameView(widget)->frame(); |
| 993 } | 989 } |
| 994 | 990 |
| 995 static LocalFrame* subframeForHitTestResult(const MouseEventWithHitTestResults&
hitTestResult) | 991 static LocalFrame* subframeForHitTestResult(const MouseEventWithHitTestResults&
hitTestResult) |
| 996 { | 992 { |
| 997 if (!hitTestResult.isOverWidget()) | 993 if (!hitTestResult.isOverWidget()) |
| (...skipping 2908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3906 unsigned EventHandler::accessKeyModifiers() | 3902 unsigned EventHandler::accessKeyModifiers() |
| 3907 { | 3903 { |
| 3908 #if OS(MACOSX) | 3904 #if OS(MACOSX) |
| 3909 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3905 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3910 #else | 3906 #else |
| 3911 return PlatformEvent::AltKey; | 3907 return PlatformEvent::AltKey; |
| 3912 #endif | 3908 #endif |
| 3913 } | 3909 } |
| 3914 | 3910 |
| 3915 } // namespace blink | 3911 } // namespace blink |
| OLD | NEW |