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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState 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 2641 matching lines...) Expand 10 before | Expand all | Expand 10 after
2652 WebFocusTypeForward, nullptr)); 2652 WebFocusTypeForward, nullptr));
2653 return; 2653 return;
2654 } 2654 }
2655 } 2655 }
2656 2656
2657 if (!document().page()->focusController().setFocusedElement( 2657 if (!document().page()->focusController().setFocusedElement(
2658 this, document().frame(), params)) 2658 this, document().frame(), params))
2659 return; 2659 return;
2660 2660
2661 if (document().focusedElement() == this && 2661 if (document().focusedElement() == this &&
2662 document().hasReceivedUserGesture()) { 2662 document().frame()->hasReceivedUserGesture()) {
2663 // Bring up the keyboard in the context of anything triggered by a user 2663 // Bring up the keyboard in the context of anything triggered by a user
2664 // gesture. Since tracking that across arbitrary boundaries (eg. 2664 // gesture. Since tracking that across arbitrary boundaries (eg.
2665 // animations) is difficult, for now we match IE's heuristic and bring 2665 // animations) is difficult, for now we match IE's heuristic and bring
2666 // up the keyboard if there's been any gesture since load. 2666 // up the keyboard if there's been any gesture since load.
2667 document().page()->chromeClient().showVirtualKeyboard(); 2667 document().page()->chromeClient().showVirtualKeyboard();
2668 } 2668 }
2669 } 2669 }
2670 2670
2671 void Element::updateFocusAppearance( 2671 void Element::updateFocusAppearance(
2672 SelectionBehaviorOnFocus selectionBehavior) { 2672 SelectionBehaviorOnFocus selectionBehavior) {
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
4124 } 4124 }
4125 4125
4126 DEFINE_TRACE_WRAPPERS(Element) { 4126 DEFINE_TRACE_WRAPPERS(Element) {
4127 if (hasRareData()) { 4127 if (hasRareData()) {
4128 visitor->traceWrappers(elementRareData()); 4128 visitor->traceWrappers(elementRareData());
4129 } 4129 }
4130 ContainerNode::traceWrappers(visitor); 4130 ContainerNode::traceWrappers(visitor);
4131 } 4131 }
4132 4132
4133 } // namespace blink 4133 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/DocumentUserGestureTokenTest.cpp ('k') | third_party/WebKit/Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698