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

Side by Side Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Created 3 years, 11 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) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * (C) 2007 Eric Seidel (eric@webkit.org) 9 * (C) 2007 Eric Seidel (eric@webkit.org)
10 * 10 *
(...skipping 2619 matching lines...) Expand 10 before | Expand all | Expand 10 after
2630 WebFocusTypeForward, nullptr)); 2630 WebFocusTypeForward, nullptr));
2631 return; 2631 return;
2632 } 2632 }
2633 } 2633 }
2634 2634
2635 if (!document().page()->focusController().setFocusedElement( 2635 if (!document().page()->focusController().setFocusedElement(
2636 this, document().frame(), params)) 2636 this, document().frame(), params))
2637 return; 2637 return;
2638 2638
2639 if (document().focusedElement() == this && 2639 if (document().focusedElement() == this &&
2640 document().hasReceivedUserGesture()) { 2640 document().frame()->hasReceivedUserGesture()) {
2641 // Bring up the keyboard in the context of anything triggered by a user 2641 // Bring up the keyboard in the context of anything triggered by a user
2642 // gesture. Since tracking that across arbitrary boundaries (eg. 2642 // gesture. Since tracking that across arbitrary boundaries (eg.
2643 // animations) is difficult, for now we match IE's heuristic and bring 2643 // animations) is difficult, for now we match IE's heuristic and bring
2644 // up the keyboard if there's been any gesture since load. 2644 // up the keyboard if there's been any gesture since load.
2645 document().page()->chromeClient().showImeIfNeeded(); 2645 document().page()->chromeClient().showImeIfNeeded();
2646 } 2646 }
2647 } 2647 }
2648 2648
2649 void Element::updateFocusAppearance( 2649 void Element::updateFocusAppearance(
2650 SelectionBehaviorOnFocus selectionBehavior) { 2650 SelectionBehaviorOnFocus selectionBehavior) {
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
4112 } 4112 }
4113 4113
4114 DEFINE_TRACE_WRAPPERS(Element) { 4114 DEFINE_TRACE_WRAPPERS(Element) {
4115 if (hasRareData()) { 4115 if (hasRareData()) {
4116 visitor->traceWrappers(elementRareData()); 4116 visitor->traceWrappers(elementRareData());
4117 } 4117 }
4118 ContainerNode::traceWrappers(visitor); 4118 ContainerNode::traceWrappers(visitor);
4119 } 4119 }
4120 4120
4121 } // namespace blink 4121 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698