Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1161)

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 235553006: Move Document pointer from Frame to LocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 1008
1009 static LocalFrame* subframeForTargetNode(Node* node) 1009 static LocalFrame* subframeForTargetNode(Node* node)
1010 { 1010 {
1011 if (!node) 1011 if (!node)
1012 return 0; 1012 return 0;
1013 1013
1014 RenderObject* renderer = node->renderer(); 1014 RenderObject* renderer = node->renderer();
1015 if (!renderer || !renderer->isWidget()) 1015 if (!renderer || !renderer->isWidget())
1016 return 0; 1016 return 0;
1017 1017
1018
1019 // FIXME: This explicit check is needed only until RemoteFrames have RemoteF rameViews. 1018 // FIXME: This explicit check is needed only until RemoteFrames have RemoteF rameViews.
1020 if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFra me() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary()) 1019 if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFra me() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary())
1021 return 0; 1020 return 0;
1022 1021
1023 Widget* widget = toRenderWidget(renderer)->widget(); 1022 Widget* widget = toRenderWidget(renderer)->widget();
1024 if (!widget || !widget->isFrameView()) 1023 if (!widget || !widget->isFrameView())
1025 return 0; 1024 return 0;
1026 1025
1027 return &toFrameView(widget)->frame(); 1026 return &toFrameView(widget)->frame();
1028 } 1027 }
(...skipping 3010 matching lines...) Expand 10 before | Expand all | Expand 10 after
4039 unsigned EventHandler::accessKeyModifiers() 4038 unsigned EventHandler::accessKeyModifiers()
4040 { 4039 {
4041 #if OS(MACOSX) 4040 #if OS(MACOSX)
4042 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4041 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4043 #else 4042 #else
4044 return PlatformEvent::AltKey; 4043 return PlatformEvent::AltKey;
4045 #endif 4044 #endif
4046 } 4045 }
4047 4046
4048 } // namespace WebCore 4047 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698