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

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

Issue 9699014: Merge 110226 - NULL renderer possible in WebCore::HTMLInputElement::setCanReceiveDroppedFiles() (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 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/events/input-element-display-none-in-dragleave-crash-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 * 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 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 9 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
10 * 10 *
(...skipping 1356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 bool HTMLInputElement::canReceiveDroppedFiles() const 1367 bool HTMLInputElement::canReceiveDroppedFiles() const
1368 { 1368 {
1369 return m_canReceiveDroppedFiles; 1369 return m_canReceiveDroppedFiles;
1370 } 1370 }
1371 1371
1372 void HTMLInputElement::setCanReceiveDroppedFiles(bool canReceiveDroppedFiles) 1372 void HTMLInputElement::setCanReceiveDroppedFiles(bool canReceiveDroppedFiles)
1373 { 1373 {
1374 if (m_canReceiveDroppedFiles == canReceiveDroppedFiles) 1374 if (m_canReceiveDroppedFiles == canReceiveDroppedFiles)
1375 return; 1375 return;
1376 m_canReceiveDroppedFiles = canReceiveDroppedFiles; 1376 m_canReceiveDroppedFiles = canReceiveDroppedFiles;
1377 renderer()->updateFromElement(); 1377 if (renderer())
1378 renderer()->updateFromElement();
1378 } 1379 }
1379 1380
1380 String HTMLInputElement::visibleValue() const 1381 String HTMLInputElement::visibleValue() const
1381 { 1382 {
1382 return m_inputType->visibleValue(); 1383 return m_inputType->visibleValue();
1383 } 1384 }
1384 1385
1385 String HTMLInputElement::convertFromVisibleValue(const String& visibleValue) con st 1386 String HTMLInputElement::convertFromVisibleValue(const String& visibleValue) con st
1386 { 1387 {
1387 return m_inputType->convertFromVisibleValue(visibleValue); 1388 return m_inputType->convertFromVisibleValue(visibleValue);
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 if (newValue != m_valueIfDirty) 1824 if (newValue != m_valueIfDirty)
1824 setValue(newValue); 1825 setValue(newValue);
1825 } 1826 }
1826 1827
1827 String HTMLInputElement::defaultToolTip() const 1828 String HTMLInputElement::defaultToolTip() const
1828 { 1829 {
1829 return m_inputType->defaultToolTip(); 1830 return m_inputType->defaultToolTip();
1830 } 1831 }
1831 1832
1832 } // namespace 1833 } // namespace
OLDNEW
« no previous file with comments | « LayoutTests/fast/events/input-element-display-none-in-dragleave-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698