Have InputType factories take an HTMLInputElement reference in parameter

Source/core/html/forms/FileInputType.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
 #include "platform/text/PlatformLocale.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 using WebKit::WebLocalizedString;
 using namespace HTMLNames;
 
-inline FileInputType::FileInputType(HTMLInputElement* element)
+inline FileInputType::FileInputType(HTMLInputElement& element)
     : BaseClickableWithKeyInputType(element)
     , m_fileList(FileList::create())
 {
 }
 
-PassRefPtr<InputType> FileInputType::create(HTMLInputElement* element)
+PassRefPtr<InputType> FileInputType::create(HTMLInputElement& element)
 {
     return adoptRef(new FileInputType(element));
 }
 
 Vector<FileChooserFileInfo> FileInputType::filesFromFormControlState(const FormControlState& state)
 {
     Vector<FileChooserFileInfo> files;
     for (size_t i = 0; i < state.valueSize(); i += 2) {
         if (!state[i + 1].isEmpty())
             files.append(FileChooserFileInfo(state[i], state[i + 1]));
@@ skipping 23 matching lines @@
 
 void FileInputType::restoreFormControlState(const FormControlState& state)
 {
     if (state.valueSize() % 2)
         return;
     filesChosen(filesFromFormControlState(state));
 }
 
 bool FileInputType::appendFormData(FormDataList& encoding, bool multipart) const
 {
-    FileList* fileList = element()->files();
+    FileList* fileList = element().files();
     unsigned numFiles = fileList->length();
     if (!multipart) {
         // Send only the basenames.
         // 4.10.16.4 and 4.10.16.6 sections in HTML5.
 
         // Unlike the multipart case, we have no special handling for the empty
         // fileList because Netscape doesn't support for non-multipart
         // submission of file inputs, and Firefox doesn't add "name=" query
         // parameter.
         for (unsigned i = 0; i < numFiles; ++i)
-            encoding.appendData(element()->name(), fileList->item(i)->name());
+            encoding.appendData(element().name(), fileList->item(i)->name());
         return true;
     }
 
     // If no filename at all is entered, return successful but empty.
     // Null would be more logical, but Netscape posts an empty file. Argh.
     if (!numFiles) {
-        encoding.appendBlob(element()->name(), File::create(""));
+        encoding.appendBlob(element().name(), File::create(""));
         return true;
     }
 
     for (unsigned i = 0; i < numFiles; ++i)
-        encoding.appendBlob(element()->name(), fileList->item(i));
+        encoding.appendBlob(element().name(), fileList->item(i));
     return true;
 }
 
 bool FileInputType::valueMissing(const String& value) const
 {
-    return element()->isRequired() && value.isEmpty();
+    return element().isRequired() && value.isEmpty();
 }
 
 String FileInputType::valueMissingText() const
 {
-    return locale().queryString(element()->multiple() ? WebLocalizedString::ValidationValueMissingForMultipleFile : WebLocalizedString::ValidationValueMissingForFile);
+    return locale().queryString(element().multiple() ? WebLocalizedString::ValidationValueMissingForMultipleFile : WebLocalizedString::ValidationValueMissingForFile);
 }
 
 void FileInputType::handleDOMActivateEvent(Event* event)
 {
-    if (element()->isDisabledFormControl())
+    if (element().isDisabledFormControl())
         return;
 
     if (!UserGestureIndicator::processingUserGesture())
         return;
 
     if (Chrome* chrome = this->chrome()) {
         FileChooserSettings settings;
-        HTMLInputElement* input = element();
-        settings.allowsDirectoryUpload = RuntimeEnabledFeatures::directoryUploadEnabled() && input->fastHasAttribute(webkitdirectoryAttr);
-        settings.allowsMultipleFiles = settings.allowsDirectoryUpload || input->fastHasAttribute(multipleAttr);
-        settings.acceptMIMETypes = input->acceptMIMETypes();
-        settings.acceptFileExtensions = input->acceptFileExtensions();
+        HTMLInputElement& input = element();
+        settings.allowsDirectoryUpload = RuntimeEnabledFeatures::directoryUploadEnabled() && input.fastHasAttribute(webkitdirectoryAttr);
+        settings.allowsMultipleFiles = settings.allowsDirectoryUpload || input.fastHasAttribute(multipleAttr);
+        settings.acceptMIMETypes = input.acceptMIMETypes();
+        settings.acceptFileExtensions = input.acceptFileExtensions();
         settings.selectedFiles = m_fileList->paths();
 #if ENABLE(MEDIA_CAPTURE)
-        settings.useMediaCapture = input->capture();
+        settings.useMediaCapture = input.capture();
 #endif
-        chrome->runOpenPanel(input->document().frame(), newFileChooser(settings));
+        chrome->runOpenPanel(input.document().frame(), newFileChooser(settings));
     }
     event->setDefaultHandled();
 }
 
 RenderObject* FileInputType::createRenderer(RenderStyle*) const
 {
-    return new RenderFileUploadControl(element());
+    return new RenderFileUploadControl(&element());
 }
 
 bool FileInputType::canSetStringValue() const
 {
     return false;
 }
 
 FileList* FileInputType::files()
 {
     return m_fileList.get();
@@ skipping 21 matching lines @@
     // decided to try to parse the value by looking for backslashes
     // (because that's what Windows file paths use). To be compatible
     // with that code, we make up a fake path for the file.
     value = "C:\\fakepath\\" + m_fileList->item(0)->name();
     return true;
 }
 
 void FileInputType::setValue(const String&, bool, TextFieldEventBehavior)
 {
     m_fileList->clear();
-    element()->setNeedsStyleRecalc();
+    element().setNeedsStyleRecalc();
 }
 
 PassRefPtr<FileList> FileInputType::createFileList(const Vector<FileChooserFileInfo>& files) const
 {
     RefPtr<FileList> fileList(FileList::create());
     size_t size = files.size();
 
     // If a directory is being selected, the UI allows a directory to be chosen
     // and the paths provided here share a root directory somewhere up the tree;
     // we want to store only the relative paths from that point.
-    if (size && element()->fastHasAttribute(webkitdirectoryAttr) && RuntimeEnabledFeatures::directoryUploadEnabled()) {
+    if (size && element().fastHasAttribute(webkitdirectoryAttr) && RuntimeEnabledFeatures::directoryUploadEnabled()) {
         // Find the common root path.
         String rootPath = directoryName(files[0].path);
         for (size_t i = 1; i < size; i++) {
             while (!files[i].path.startsWith(rootPath))
                 rootPath = directoryName(rootPath);
         }
         rootPath = directoryName(rootPath);
         ASSERT(rootPath.length());
         int rootLength = rootPath.length();
         if (rootPath[rootLength - 1] != '\\' && rootPath[rootLength - 1] != '/')
@@ skipping 11 matching lines @@
     return fileList;
 }
 
 bool FileInputType::isFileUpload() const
 {
     return true;
 }
 
 void FileInputType::createShadowSubtree()
 {
-    ASSERT(element()->shadow());
-    RefPtr<HTMLInputElement> button = HTMLInputElement::create(inputTag, element()->document(), 0, false);
+    ASSERT(element().shadow());
+    RefPtr<HTMLInputElement> button = HTMLInputElement::create(inputTag, element().document(), 0, false);
     button->setType(InputTypeNames::button());
-    button->setAttribute(valueAttr, locale().queryString(element()->multiple() ? WebLocalizedString::FileButtonChooseMultipleFilesLabel : WebLocalizedString::FileButtonChooseFileLabel));
+    button->setAttribute(valueAttr, locale().queryString(element().multiple() ? WebLocalizedString::FileButtonChooseMultipleFilesLabel : WebLocalizedString::FileButtonChooseFileLabel));
     button->setPart(AtomicString("-webkit-file-upload-button", AtomicString::ConstructFromLiteral));
-    element()->userAgentShadowRoot()->appendChild(button.release());
+    element().userAgentShadowRoot()->appendChild(button.release());
 }
 
 void FileInputType::disabledAttributeChanged()
 {
-    ASSERT(element()->shadow());
-    if (Element* button = toElement(element()->userAgentShadowRoot()->firstChild()))
-        button->setBooleanAttribute(disabledAttr, element()->isDisabledFormControl());
+    ASSERT(element().shadow());
+    if (Element* button = toElement(element().userAgentShadowRoot()->firstChild()))
+        button->setBooleanAttribute(disabledAttr, element().isDisabledFormControl());
 }
 
 void FileInputType::multipleAttributeChanged()
 {
-    ASSERT(element()->shadow());
-    if (Element* button = toElement(element()->userAgentShadowRoot()->firstChild()))
-        button->setAttribute(valueAttr, locale().queryString(element()->multiple() ? WebLocalizedString::FileButtonChooseMultipleFilesLabel : WebLocalizedString::FileButtonChooseFileLabel));
+    ASSERT(element().shadow());
+    if (Element* button = toElement(element().userAgentShadowRoot()->firstChild()))
+        button->setAttribute(valueAttr, locale().queryString(element().multiple() ? WebLocalizedString::FileButtonChooseMultipleFilesLabel : WebLocalizedString::FileButtonChooseFileLabel));
 }
 
 void FileInputType::setFiles(PassRefPtr<FileList> files)
 {
     if (!files)
         return;
 
-    RefPtr<HTMLInputElement> input = element();
+    RefPtr<HTMLInputElement> input(element());
 
     bool pathsChanged = false;
     if (files->length() != m_fileList->length()) {
         pathsChanged = true;
     } else {
         for (unsigned i = 0; i < files->length(); ++i) {
             if (files->item(i)->path() != m_fileList->item(i)->path()) {
                 pathsChanged = true;
                 break;
             }
@@ skipping 23 matching lines @@
 
 void FileInputType::filesChosen(const Vector<FileChooserFileInfo>& files)
 {
     setFiles(createFileList(files));
 }
 
 void FileInputType::receiveDropForDirectoryUpload(const Vector<String>& paths)
 {
     if (Chrome* chrome = this->chrome()) {
         FileChooserSettings settings;
-        HTMLInputElement* input = element();
+        HTMLInputElement& input = element();
         settings.allowsDirectoryUpload = true;
         settings.allowsMultipleFiles = true;
         settings.selectedFiles.append(paths[0]);
-        settings.acceptMIMETypes = input->acceptMIMETypes();
-        settings.acceptFileExtensions = input->acceptFileExtensions();
+        settings.acceptMIMETypes = input.acceptMIMETypes();
+        settings.acceptFileExtensions = input.acceptFileExtensions();
         chrome->enumerateChosenDirectory(newFileChooser(settings));
     }
 }
 
 bool FileInputType::receiveDroppedFiles(const DragData* dragData)
 {
     Vector<String> paths;
     dragData->asFilenames(paths);
     if (paths.isEmpty())
         return false;
 
-    HTMLInputElement* input = element();
-    if (input->fastHasAttribute(webkitdirectoryAttr) && RuntimeEnabledFeatures::directoryUploadEnabled()) {
+    HTMLInputElement& input = element();
+    if (input.fastHasAttribute(webkitdirectoryAttr) && RuntimeEnabledFeatures::directoryUploadEnabled()) {
         receiveDropForDirectoryUpload(paths);
         return true;
     }
 
     m_droppedFileSystemId = dragData->droppedFileSystemId();
 
     Vector<FileChooserFileInfo> files;
     for (unsigned i = 0; i < paths.size(); ++i)
         files.append(FileChooserFileInfo(paths[i]));
 
-    if (input->fastHasAttribute(multipleAttr)) {
+    if (input.fastHasAttribute(multipleAttr)) {
         filesChosen(files);
     } else {
         Vector<FileChooserFileInfo> firstFileOnly;
         firstFileOnly.append(files[0]);
         filesChosen(firstFileOnly);
     }
     return true;
 }
 
 String FileInputType::droppedFileSystemId()
@@ skipping 12 matching lines @@
     StringBuilder names;
     for (size_t i = 0; i < listSize; ++i) {
         names.append(fileList->item(i)->name());
         if (i != listSize - 1)
             names.append('\n');
     }
     return names.toString();
 }
 
 } // namespace WebCore