Merge webkit.org at r54731 : Initial merge by git

Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a

10 files changed, 107 insertions, 12 deletions

diff --git a/WebKit/chromium/public/WebContextMenuData.h b/WebKit/chromium/public/WebContextMenuData.h
index 049da9c..5d67046 100644
--- a/WebKit/chromium/public/WebContextMenuData.h
+++ b/WebKit/chromium/public/WebContextMenuData.h
@@ -103,7 +103,8 @@ struct WebContextMenuData {
         CheckableMenuItemChecked = 0x2,
     };
 
-    // Writing direction menu items.
+    // Writing direction menu items - values are unions of
+    // CheckableMenuItemFlags.
     // Currently only used on OS X.
     int writingDirectionDefault;
     int writingDirectionLeftToRight;
diff --git a/WebKit/chromium/public/WebDatabase.h b/WebKit/chromium/public/WebDatabase.h
index 179e828..108201d 100644
--- a/WebKit/chromium/public/WebDatabase.h
+++ b/WebKit/chromium/public/WebDatabase.h
@@ -72,6 +72,8 @@ public:
     WEBKIT_API static void updateDatabaseSize(
         const WebString& originIdentifier, const WebString& databaseName,
         unsigned long long databaseSize, unsigned long long spaceAvailable);
+    WEBKIT_API static void closeDatabaseImmediately(
+        const WebString& originIdentifier, const WebString& databaseName);
 
 #if WEBKIT_IMPLEMENTATION
     WebDatabase(const WTF::PassRefPtr<WebCore::Database>&);
diff --git a/WebKit/chromium/public/WebDragData.h b/WebKit/chromium/public/WebDragData.h
index 01582a9..0b861c8 100644
--- a/WebKit/chromium/public/WebDragData.h
+++ b/WebKit/chromium/public/WebDragData.h
@@ -74,6 +74,8 @@ public:
 
     WEBKIT_API WebURL downloadURL() const;
     WEBKIT_API void setDownloadURL(const WebURL&);
+    WEBKIT_API WebString downloadMetadata() const;
+    WEBKIT_API void setDownloadMetadata(const WebString&);
 
     WEBKIT_API WebString fileExtension() const;
     WEBKIT_API void setFileExtension(const WebString&);
diff --git a/WebKit/chromium/public/WebFileInfo.h b/WebKit/chromium/public/WebFileInfo.h
new file mode 100644
index 0000000..4590a30
--- /dev/null
+++ b/WebKit/chromium/public/WebFileInfo.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebFileInfo_h
+#define WebFileInfo_h
+
+namespace WebKit {
+
+struct WebFileInfo {
+    // The last modification time of the file, in seconds.
+    // The value 0.0 means that the time is not set.
+    double modificationTime;
+
+    WebFileInfo() : modificationTime(0.0) { }
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/public/WebHTTPBody.h b/WebKit/chromium/public/WebHTTPBody.h
index 43f51a6..fcc44ff 100644
--- a/WebKit/chromium/public/WebHTTPBody.h
+++ b/WebKit/chromium/public/WebHTTPBody.h
@@ -32,6 +32,7 @@
 #define WebHTTPBody_h
 
 #include "WebData.h"
+#include "WebFileInfo.h"
 #include "WebNonCopyable.h"
 #include "WebString.h"
 
@@ -50,6 +51,9 @@ public:
         enum { TypeData, TypeFile } type;
         WebData data;
         WebString filePath;
+        long long fileStart;
+        long long fileLength; // -1 means to the end of the file.
+        WebFileInfo fileInfo;
     };
 
     ~WebHTTPBody() { reset(); }
@@ -77,7 +81,9 @@ public:
 
     // Append to the list of elements.
     WEBKIT_API void appendData(const WebData&);
-    WEBKIT_API void appendFile(const WebString&);
+    WEBKIT_API void appendFile(const WebString&); // FIXME: to be removed.
+    // Passing -1 to fileLength means to the end of the file.
+    WEBKIT_API void appendFile(const WebString&, long long fileStart, long long fileLength, const WebFileInfo&);
 
     // Identifies a particular form submission instance.  A value of 0 is
     // used to indicate an unspecified identifier.
diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h
index 226624a..59643d1 100644
--- a/WebKit/chromium/public/WebInputElement.h
+++ b/WebKit/chromium/public/WebInputElement.h
@@ -81,11 +81,12 @@ namespace WebKit {
             Time,
             Week
         };
-        
+
         WEBKIT_API bool autoComplete() const;
         WEBKIT_API bool isEnabledFormControl() const;
         WEBKIT_API InputType inputType() const;
         WEBKIT_API WebString formControlType() const;
+        WEBKIT_API bool isActivatedSubmit() const;
         WEBKIT_API void setActivatedSubmit(bool);
         WEBKIT_API void setValue(const WebString& value);
         WEBKIT_API WebString value() const;
@@ -97,7 +98,6 @@ namespace WebKit {
         // storing autofill data.  This is either the field name or its id, an empty
         // string if it has no name and no id.
         WEBKIT_API WebString nameForAutofill() const;
-        
     };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index fe6c801..fbaa218 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -59,7 +59,6 @@ class WebStorageNamespace;
 class WebThemeEngine;
 class WebURLLoader;
 struct WebCookie;
-struct WebPluginInfo;
 template <typename T> class WebVector;
 
 class WebKitClient {
diff --git a/WebKit/chromium/public/WebStorageArea.h b/WebKit/chromium/public/WebStorageArea.h
index 19d98c6..5e2c11c 100644
--- a/WebKit/chromium/public/WebStorageArea.h
+++ b/WebKit/chromium/public/WebStorageArea.h
@@ -45,6 +45,12 @@ class WebStorageArea {
 public:
     virtual ~WebStorageArea() { }
 
+    enum Result {
+        ResultOK = 0,
+        ResultBlockedByQuota,
+        ResultBlockedByPolicy
+    };
+
     // The number of key/value pairs in the storage area.
     virtual unsigned length() = 0;
 
@@ -57,10 +63,22 @@ public:
     // no entry for that key.
     virtual WebString getItem(const WebString& key) = 0;
 
-    // Set the value that corresponds to a specific key. QuotaException is set if
-    // the StorageArea would have exceeded its quota. The value is NOT set when there's
-    // an exception.  url is the url that should be used if a storage event fires.
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue) = 0;
+    // Set the value that corresponds to a specific key. Result will either be ResultOK
+    // or some particular error. The value is NOT set when there's an error.  url is the
+    // url that should be used if a storage event fires.
+    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, Result& result, WebString& oldValue)
+    {
+        bool quotaException = false;
+        setItem(key, newValue, url, quotaException, oldValue);
+        result = quotaException ? ResultBlockedByQuota : ResultOK;
+    }
+    // FIXME: Remove soon (once Chrome has rolled past this revision).
+    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue)
+    {
+        Result result;
+        setItem(key, newValue, url, result, oldValue);
+        quotaException = result != ResultOK;
+    }
 
     // Remove the value associated with a particular key.  url is the url that should be used
     // if a storage event fires.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 7b3294f..99125d4 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -223,17 +223,35 @@ public:
     virtual WebAccessibilityObject accessibilityObject() = 0;
 
 
-    // Autofill ------------------------------------------------------------
+    // AutoFill / Autocomplete ---------------------------------------------
 
-    // Notifies the WebView that autofill suggestions are available for a node.
+    // DEPRECATED: WebView::applyAutocompleteSuggestions is the new way to
+    // access this.
     virtual void applyAutofillSuggestions(
         const WebNode&,
         const WebVector<WebString>& suggestions,
         int defaultSuggestionIndex) = 0;
 
-    // Hides the autofill popup if any are showing.
+    // Notifies the WebView that AutoFill suggestions are available for a node.
+    virtual void applyAutoFillSuggestions(
+        const WebNode&,
+        const WebVector<WebString>& names,
+        const WebVector<WebString>& labels,
+        int defaultSuggestionIndex) = 0;
+
+    // Notifies the WebView that Autocomplete suggestions are available for a
+    // node.
+    virtual void applyAutocompleteSuggestions(
+        const WebNode&,
+        const WebVector<WebString>& suggestions,
+        int defaultSuggestionIndex) = 0;
+
+    // DEPRECATED: WebView::hideSuggestionsPopup is the new way to access this.
     virtual void hideAutofillPopup() = 0;
 
+    // Hides the suggestions popup if any are showing.
+    virtual void hideSuggestionsPopup() = 0;
+
 
     // Context menu --------------------------------------------------------
 
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 964d382..4d272bb 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -252,6 +252,9 @@ public:
     // accessibility object.
     virtual void focusAccessibilityObject(const WebAccessibilityObject&) { }
 
+    // Notifies embedder that the state of an accessibility object has changed.
+    virtual void didChangeAccessibilityObjectState(const WebAccessibilityObject&) { }
+
 
     // Developer tools -----------------------------------------------------