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

Side by Side Diff: Source/WebCore/rendering/RenderFileUploadControl.cpp

Issue 6542053: Merge 78168 - 2011-02-09 Ryosuke Niwa <rniwa@webkit.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 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/rendering/RenderFileUploadControl.h ('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) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, computeCont entBoxLogicalWidth(style()->maxWidth().value())); 290 m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, computeCont entBoxLogicalWidth(style()->maxWidth().value()));
291 } 291 }
292 292
293 int toAdd = borderAndPaddingWidth(); 293 int toAdd = borderAndPaddingWidth();
294 m_minPreferredLogicalWidth += toAdd; 294 m_minPreferredLogicalWidth += toAdd;
295 m_maxPreferredLogicalWidth += toAdd; 295 m_maxPreferredLogicalWidth += toAdd;
296 296
297 setPreferredLogicalWidthsDirty(false); 297 setPreferredLogicalWidthsDirty(false);
298 } 298 }
299 299
300 VisiblePosition RenderFileUploadControl::positionForPoint(const IntPoint&)
301 {
302 return VisiblePosition();
303 }
304
300 void RenderFileUploadControl::receiveDroppedFiles(const Vector<String>& paths) 305 void RenderFileUploadControl::receiveDroppedFiles(const Vector<String>& paths)
301 { 306 {
302 if (allowsMultipleFiles()) 307 if (allowsMultipleFiles())
303 m_fileChooser->chooseFiles(paths); 308 m_fileChooser->chooseFiles(paths);
304 else 309 else
305 m_fileChooser->chooseFile(paths[0]); 310 m_fileChooser->chooseFile(paths[0]);
306 } 311 }
307 312
308 String RenderFileUploadControl::buttonValue() 313 String RenderFileUploadControl::buttonValue()
309 { 314 {
310 if (!m_button) 315 if (!m_button)
311 return String(); 316 return String();
312 317
313 return m_button->value(); 318 return m_button->value();
314 } 319 }
315 320
316 String RenderFileUploadControl::fileTextValue() const 321 String RenderFileUploadControl::fileTextValue() const
317 { 322 {
318 return m_fileChooser->basenameForWidth(style()->font(), maxFilenameWidth()); 323 return m_fileChooser->basenameForWidth(style()->font(), maxFilenameWidth());
319 } 324 }
320 325
321 } // namespace WebCore 326 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderFileUploadControl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698