diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-08-03 12:18:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-08-03 12:18:44 (GMT) |
| commit | 321aa9d20101560dfcef6738be70916b47dbb0ed (patch) | |
| tree | f8e4502a7c386f308bcd559f42a89a2463b3902a /src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp | |
| parent | dfb56c408b2561c194922f36a0d08c2dc7c43f9b (diff) | |
| download | Qt-321aa9d20101560dfcef6738be70916b47dbb0ed.zip Qt-321aa9d20101560dfcef6738be70916b47dbb0ed.tar.gz Qt-321aa9d20101560dfcef6738be70916b47dbb0ed.tar.bz2 | |
Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefcc
Integrated changes:
|| <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com ||
|| <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant ||
|| <https://webkit.org/b/43037> || [Qt] Incorrect input method hints ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp index 14d126d..6a5c1e0 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp @@ -114,10 +114,10 @@ String RenderFileUploadControl::acceptTypes() return static_cast<HTMLInputElement*>(node())->accept(); } -void RenderFileUploadControl::chooseIconForFiles(const Vector<String>& filenames) +void RenderFileUploadControl::chooseIconForFiles(FileChooser* chooser, const Vector<String>& filenames) { if (Chrome* chromePointer = chrome()) - chromePointer->chooseIconForFiles(filenames, m_fileChooser); + chromePointer->chooseIconForFiles(filenames, chooser); } void RenderFileUploadControl::click() @@ -195,6 +195,7 @@ void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, int tx, int ty) { if (style()->visibility() != VISIBLE) return; + ASSERT(m_fileChooser); // Push a clip. if (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseChildBlockBackgrounds) { |