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

Side by Side Diff: Source/core/html/HTMLFrameElementBase.cpp

Issue 642203002: Make input event forwarding work in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix merge conflict. Created 6 years, 2 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
« no previous file with comments | « no previous file | Source/core/page/ChromeClient.h » ('j') | Source/web/WebInputEventConversion.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 13 matching lines...) Expand all
24 #include "config.h" 24 #include "config.h"
25 #include "core/html/HTMLFrameElementBase.h" 25 #include "core/html/HTMLFrameElementBase.h"
26 26
27 #include "bindings/core/v8/ScriptController.h" 27 #include "bindings/core/v8/ScriptController.h"
28 #include "bindings/core/v8/ScriptEventListener.h" 28 #include "bindings/core/v8/ScriptEventListener.h"
29 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
30 #include "core/dom/Attribute.h" 30 #include "core/dom/Attribute.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/frame/FrameView.h" 32 #include "core/frame/FrameView.h"
33 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
34 #include "core/frame/RemoteFrame.h"
34 #include "core/html/parser/HTMLParserIdioms.h" 35 #include "core/html/parser/HTMLParserIdioms.h"
35 #include "core/loader/FrameLoader.h" 36 #include "core/loader/FrameLoader.h"
36 #include "core/page/ChromeClient.h" 37 #include "core/page/ChromeClient.h"
37 #include "core/page/FocusController.h" 38 #include "core/page/FocusController.h"
38 #include "core/page/Page.h" 39 #include "core/page/Page.h"
39 #include "core/rendering/RenderPart.h" 40 #include "core/rendering/RenderPart.h"
40 41
41 namespace blink { 42 namespace blink {
42 43
43 using namespace HTMLNames; 44 using namespace HTMLNames;
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 205
205 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst 206 bool HTMLFrameElementBase::isHTMLContentAttribute(const Attribute& attribute) co nst
206 { 207 {
207 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten tAttribute(attribute); 208 return attribute.name() == srcdocAttr || HTMLFrameOwnerElement::isHTMLConten tAttribute(attribute);
208 } 209 }
209 210
210 // FIXME: Remove this code once we have input routing in the browser 211 // FIXME: Remove this code once we have input routing in the browser
211 // process. See http://crbug.com/339659. 212 // process. See http://crbug.com/339659.
212 void HTMLFrameElementBase::defaultEventHandler(Event* event) 213 void HTMLFrameElementBase::defaultEventHandler(Event* event)
213 { 214 {
214 if (contentFrame() && contentFrame()->isRemoteFrameTemporary()) { 215 if (contentFrame() && contentFrame()->isRemoteFrame()) {
215 contentFrame()->chromeClient().forwardInputEvent(contentFrame(), event); 216 contentFrame()->chromeClient().forwardInputEvent(toRemoteFrame(contentFr ame()), event);
216 return; 217 return;
217 } 218 }
218 HTMLFrameOwnerElement::defaultEventHandler(event); 219 HTMLFrameOwnerElement::defaultEventHandler(event);
219 } 220 }
220 221
221 } // namespace blink 222 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/page/ChromeClient.h » ('j') | Source/web/WebInputEventConversion.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698