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

Side by Side Diff: Source/WebCore/html/HTMLInputElement.cpp

Issue 7065003: Merge 86976 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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 | « Source/WebCore/html/HTMLFormControlElement.cpp ('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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) 7 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 return m_inputType->rendererIsNeeded() && HTMLFormControlElementWithState::r endererIsNeeded(style); 680 return m_inputType->rendererIsNeeded() && HTMLFormControlElementWithState::r endererIsNeeded(style);
681 } 681 }
682 682
683 RenderObject* HTMLInputElement::createRenderer(RenderArena* arena, RenderStyle* style) 683 RenderObject* HTMLInputElement::createRenderer(RenderArena* arena, RenderStyle* style)
684 { 684 {
685 return m_inputType->createRenderer(arena, style); 685 return m_inputType->createRenderer(arena, style);
686 } 686 }
687 687
688 void HTMLInputElement::attach() 688 void HTMLInputElement::attach()
689 { 689 {
690 suspendPostAttachCallbacks();
691
690 if (!m_hasType) 692 if (!m_hasType)
691 updateType(); 693 updateType();
692 694
693 HTMLFormControlElementWithState::attach(); 695 HTMLFormControlElementWithState::attach();
694 696
695 m_inputType->attach(); 697 m_inputType->attach();
696 698
697 if (document()->focusedNode() == this) 699 if (document()->focusedNode() == this)
698 document()->updateFocusAppearanceSoon(true /* restore selection */); 700 document()->updateFocusAppearanceSoon(true /* restore selection */);
701
702 resumePostAttachCallbacks();
699 } 703 }
700 704
701 void HTMLInputElement::detach() 705 void HTMLInputElement::detach()
702 { 706 {
703 HTMLFormControlElementWithState::detach(); 707 HTMLFormControlElementWithState::detach();
704 setFormControlValueMatchesRenderer(false); 708 setFormControlValueMatchesRenderer(false);
705 } 709 }
706 710
707 String HTMLInputElement::altText() const 711 String HTMLInputElement::altText() const
708 { 712 {
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1554 return formElement->checkedRadioButtons(); 1558 return formElement->checkedRadioButtons();
1555 return document()->checkedRadioButtons(); 1559 return document()->checkedRadioButtons();
1556 } 1560 }
1557 1561
1558 void HTMLInputElement::handleBeforeTextInsertedEvent(Event* event) 1562 void HTMLInputElement::handleBeforeTextInsertedEvent(Event* event)
1559 { 1563 {
1560 InputElement::handleBeforeTextInsertedEvent(m_data, this, this, event); 1564 InputElement::handleBeforeTextInsertedEvent(m_data, this, this, event);
1561 } 1565 }
1562 1566
1563 } // namespace 1567 } // namespace
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLFormControlElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698