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

Side by Side Diff: Source/core/html/HTMLSelectElement.cpp

Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLScriptElement.cpp ('k') | Source/core/html/HTMLSummaryElement.cpp » ('j') | 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) 2010 Nokia Corporation and/or its subsidiary(-ies). 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 1999 Antti Koivisto (koivisto@kde.org) 4 * (C) 1999 Antti Koivisto (koivisto@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 7 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
10 * 10 *
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 insertBefore(element, before, es, AttachLazily); 222 insertBefore(element, before, es, AttachLazily);
223 setNeedsValidityCheck(); 223 setNeedsValidityCheck();
224 } 224 }
225 225
226 void HTMLSelectElement::remove(int optionIndex) 226 void HTMLSelectElement::remove(int optionIndex)
227 { 227 {
228 int listIndex = optionToListIndex(optionIndex); 228 int listIndex = optionToListIndex(optionIndex);
229 if (listIndex < 0) 229 if (listIndex < 0)
230 return; 230 return;
231 231
232 listItems()[listIndex]->remove(IGNORE_EXCEPTION_STATE); 232 listItems()[listIndex]->remove(IGNORE_EXCEPTION);
233 } 233 }
234 234
235 void HTMLSelectElement::remove(HTMLOptionElement* option) 235 void HTMLSelectElement::remove(HTMLOptionElement* option)
236 { 236 {
237 if (option->ownerSelectElement() != this) 237 if (option->ownerSelectElement() != this)
238 return; 238 return;
239 239
240 option->remove(IGNORE_EXCEPTION_STATE); 240 option->remove(IGNORE_EXCEPTION);
241 } 241 }
242 242
243 String HTMLSelectElement::value() const 243 String HTMLSelectElement::value() const
244 { 244 {
245 const Vector<HTMLElement*>& items = listItems(); 245 const Vector<HTMLElement*>& items = listItems();
246 for (unsigned i = 0; i < items.size(); i++) { 246 for (unsigned i = 0; i < items.size(); i++) {
247 if (items[i]->hasLocalName(optionTag) && toHTMLOptionElement(items[i])-> selected()) 247 if (items[i]->hasLocalName(optionTag) && toHTMLOptionElement(items[i])-> selected())
248 return toHTMLOptionElement(items[i])->value(); 248 return toHTMLOptionElement(items[i])->value();
249 } 249 }
250 return ""; 250 return "";
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 return true; 1580 return true;
1581 } 1581 }
1582 1582
1583 bool HTMLSelectElement::anonymousIndexedSetterRemove(unsigned index, ExceptionSt ate& es) 1583 bool HTMLSelectElement::anonymousIndexedSetterRemove(unsigned index, ExceptionSt ate& es)
1584 { 1584 {
1585 remove(index); 1585 remove(index);
1586 return true; 1586 return true;
1587 } 1587 }
1588 1588
1589 } // namespace 1589 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLScriptElement.cpp ('k') | Source/core/html/HTMLSummaryElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698