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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 340143002: Disabled form control elements should not be active (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review Comments Created 6 years, 6 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 | « LayoutTests/fast/css/disabled-form-control-elements-should-not-be-active-expected.txt ('k') | no next file » | no next file with comments »
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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 5415 matching lines...) Expand 10 before | Expand all | Expand 10 after
5426 for (RenderObject* curr = oldActiveElement->renderer(); curr; curr = cur r->parent()) { 5426 for (RenderObject* curr = oldActiveElement->renderer(); curr; curr = cur r->parent()) {
5427 if (curr->node()) { 5427 if (curr->node()) {
5428 ASSERT(!curr->node()->isTextNode()); 5428 ASSERT(!curr->node()->isTextNode());
5429 curr->node()->setActive(false); 5429 curr->node()->setActive(false);
5430 m_userActionElements.setInActiveChain(curr->node(), false); 5430 m_userActionElements.setInActiveChain(curr->node(), false);
5431 } 5431 }
5432 } 5432 }
5433 setActiveHoverElement(nullptr); 5433 setActiveHoverElement(nullptr);
5434 } else { 5434 } else {
5435 Element* newActiveElement = innerElementInDocument; 5435 Element* newActiveElement = innerElementInDocument;
5436 if (!oldActiveElement && newActiveElement && request.active() && !reques t.touchMove()) { 5436 if (!oldActiveElement && newActiveElement && !newActiveElement->isDisabl edFormControl() && request.active() && !request.touchMove()) {
5437 // We are setting the :active chain and freezing it. If future moves happen, they 5437 // We are setting the :active chain and freezing it. If future moves happen, they
5438 // will need to reference this chain. 5438 // will need to reference this chain.
5439 for (RenderObject* curr = newActiveElement->renderer(); curr; curr = curr->parent()) { 5439 for (RenderObject* curr = newActiveElement->renderer(); curr; curr = curr->parent()) {
5440 if (curr->node() && !curr->isText()) 5440 if (curr->node() && !curr->isText())
5441 m_userActionElements.setInActiveChain(curr->node(), true); 5441 m_userActionElements.setInActiveChain(curr->node(), true);
5442 } 5442 }
5443 5443
5444 setActiveHoverElement(newActiveElement); 5444 setActiveHoverElement(newActiveElement);
5445 } 5445 }
5446 } 5446 }
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
5813 visitor->trace(m_compositorPendingAnimations); 5813 visitor->trace(m_compositorPendingAnimations);
5814 visitor->trace(m_contextDocument); 5814 visitor->trace(m_contextDocument);
5815 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5815 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5816 DocumentSupplementable::trace(visitor); 5816 DocumentSupplementable::trace(visitor);
5817 TreeScope::trace(visitor); 5817 TreeScope::trace(visitor);
5818 ContainerNode::trace(visitor); 5818 ContainerNode::trace(visitor);
5819 ExecutionContext::trace(visitor); 5819 ExecutionContext::trace(visitor);
5820 } 5820 }
5821 5821
5822 } // namespace WebCore 5822 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/disabled-form-control-elements-should-not-be-active-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698