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

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

Issue 2723963003: Remove renderer-to-renderer input event forwarding for OOPIFs (Closed)
Patch Set: Correct test expectation Created 3 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) 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 const QualifiedName& name) const { 238 const QualifiedName& name) const {
239 return name == srcAttr || HTMLFrameOwnerElement::hasLegalLinkAttribute(name); 239 return name == srcAttr || HTMLFrameOwnerElement::hasLegalLinkAttribute(name);
240 } 240 }
241 241
242 bool HTMLFrameElementBase::isHTMLContentAttribute( 242 bool HTMLFrameElementBase::isHTMLContentAttribute(
243 const Attribute& attribute) const { 243 const Attribute& attribute) const {
244 return attribute.name() == srcdocAttr || 244 return attribute.name() == srcdocAttr ||
245 HTMLFrameOwnerElement::isHTMLContentAttribute(attribute); 245 HTMLFrameOwnerElement::isHTMLContentAttribute(attribute);
246 } 246 }
247 247
248 // FIXME: Remove this code once we have input routing in the browser
249 // process. See http://crbug.com/339659.
250 void HTMLFrameElementBase::defaultEventHandler(Event* event) {
251 if (contentFrame() && contentFrame()->isRemoteFrame()) {
252 toRemoteFrame(contentFrame())->forwardInputEvent(event);
253 return;
254 }
255 HTMLFrameOwnerElement::defaultEventHandler(event);
256 }
257
258 void HTMLFrameElementBase::setScrollingMode(ScrollbarMode scrollbarMode) { 248 void HTMLFrameElementBase::setScrollingMode(ScrollbarMode scrollbarMode) {
259 if (m_scrollingMode == scrollbarMode) 249 if (m_scrollingMode == scrollbarMode)
260 return; 250 return;
261 251
262 if (contentDocument()) { 252 if (contentDocument()) {
263 contentDocument()->willChangeFrameOwnerProperties( 253 contentDocument()->willChangeFrameOwnerProperties(
264 m_marginWidth, m_marginHeight, scrollbarMode); 254 m_marginWidth, m_marginHeight, scrollbarMode);
265 } 255 }
266 m_scrollingMode = scrollbarMode; 256 m_scrollingMode = scrollbarMode;
267 frameOwnerPropertiesChanged(); 257 frameOwnerPropertiesChanged();
(...skipping 17 matching lines...) Expand all
285 275
286 if (contentDocument()) { 276 if (contentDocument()) {
287 contentDocument()->willChangeFrameOwnerProperties( 277 contentDocument()->willChangeFrameOwnerProperties(
288 m_marginWidth, marginHeight, m_scrollingMode); 278 m_marginWidth, marginHeight, m_scrollingMode);
289 } 279 }
290 m_marginHeight = marginHeight; 280 m_marginHeight = marginHeight;
291 frameOwnerPropertiesChanged(); 281 frameOwnerPropertiesChanged();
292 } 282 }
293 283
294 } // namespace blink 284 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698