| Index: Source/core/html/FileInputType.cpp
|
| diff --git a/Source/core/html/FileInputType.cpp b/Source/core/html/FileInputType.cpp
|
| index b61e2cb2720a167bc684c1f415070d2d163466e6..2eb2063de32ed148d7581291e8e935930efbbd28 100644
|
| --- a/Source/core/html/FileInputType.cpp
|
| +++ b/Source/core/html/FileInputType.cpp
|
| @@ -87,13 +87,13 @@ const AtomicString& UploadButtonElement::shadowPseudoId() const
|
| return pseudoId;
|
| }
|
|
|
| -inline FileInputType::FileInputType(HTMLInputElement* element)
|
| +inline FileInputType::FileInputType(Handle<HTMLInputElement> element)
|
| : BaseClickableWithKeyInputType(element)
|
| , m_fileList(FileList::create())
|
| {
|
| }
|
|
|
| -PassOwnPtr<InputType> FileInputType::create(HTMLInputElement* element)
|
| +PassOwnPtr<InputType> FileInputType::create(Handle<HTMLInputElement> element)
|
| {
|
| return adoptPtr(new FileInputType(element));
|
| }
|
| @@ -184,7 +184,7 @@ void FileInputType::handleDOMActivateEvent(Event* event)
|
|
|
| if (Chrome* chrome = this->chrome()) {
|
| FileChooserSettings settings;
|
| - HTMLInputElement* input = element();
|
| + Handle<HTMLInputElement> input = element();
|
| settings.allowsDirectoryUpload = RuntimeEnabledFeatures::directoryUploadEnabled() && input->fastHasAttribute(webkitdirectoryAttr);
|
| settings.allowsMultipleFiles = settings.allowsDirectoryUpload || input->fastHasAttribute(multipleAttr);
|
| settings.acceptMIMETypes = input->acceptMIMETypes();
|
| @@ -330,7 +330,7 @@ void FileInputType::setFiles(PassRefPtr<FileList> files)
|
| if (!files)
|
| return;
|
|
|
| - RefPtr<HTMLInputElement> input = element();
|
| + Handle<HTMLInputElement> input = element();
|
|
|
| bool pathsChanged = false;
|
| if (files->length() != m_fileList->length())
|
| @@ -375,7 +375,7 @@ void FileInputType::receiveDropForDirectoryUpload(const Vector<String>& paths)
|
| {
|
| if (Chrome* chrome = this->chrome()) {
|
| FileChooserSettings settings;
|
| - HTMLInputElement* input = element();
|
| + Handle<HTMLInputElement> input = element();
|
| settings.allowsDirectoryUpload = true;
|
| settings.allowsMultipleFiles = true;
|
| settings.selectedFiles.append(paths[0]);
|
| @@ -402,7 +402,7 @@ bool FileInputType::receiveDroppedFiles(const DragData* dragData)
|
| if (paths.isEmpty())
|
| return false;
|
|
|
| - HTMLInputElement* input = element();
|
| + Handle<HTMLInputElement> input = element();
|
| if (input->fastHasAttribute(webkitdirectoryAttr) && RuntimeEnabledFeatures::directoryUploadEnabled()) {
|
| receiveDropForDirectoryUpload(paths);
|
| return true;
|
|
|