15 files changed, 318 insertions, 13 deletions

diff --git a/WebKit/chromium/public/WebCommon.h b/WebKit/chromium/public/WebCommon.h
index 7872729..5f441b7 100644
--- a/WebKit/chromium/public/WebCommon.h
+++ b/WebKit/chromium/public/WebCommon.h
@@ -80,9 +80,17 @@
 
 #include <stddef.h> // For size_t
 
+#if defined(WIN32)
+// Visual Studio doesn't have stdint.h.
+typedef short int16_t;
+typedef unsigned short uint16_t;
+typedef int int32_t;
+typedef unsigned int uint32_t;
+#endif
+
 namespace WebKit {
 
-    // UTF-16 character type
+// UTF-16 character type
 #if defined(WIN32)
 typedef wchar_t WebUChar;
 #else
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index 3bdee3c..0e26cc9 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -81,7 +81,7 @@ public:
     WEBKIT_API static void setMessageLoopDispatchHandler(MessageLoopDispatchHandler);
 
     virtual void identifierForInitialRequest(unsigned long resourceId, WebFrame*, const WebURLRequest&) = 0;
-    virtual void willSendRequest(unsigned long resourceId, const WebURLRequest&) = 0;
+    virtual void willSendRequest(unsigned long resourceId, WebURLRequest&) = 0;
     virtual void didReceiveData(unsigned long resourceId, int length) = 0;
     virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0;
     virtual void didFinishLoading(unsigned long resourceId) = 0;
diff --git a/WebKit/chromium/public/WebGLES2Context.h b/WebKit/chromium/public/WebGLES2Context.h
index a7e9560..c67faf2 100644
--- a/WebKit/chromium/public/WebGLES2Context.h
+++ b/WebKit/chromium/public/WebGLES2Context.h
@@ -36,6 +36,7 @@
 
 namespace WebKit {
 
+struct WebSize;
 class WebView;
 
 // This interface abstracts the creation and management of an
@@ -49,6 +50,14 @@ public:
     virtual bool makeCurrent() = 0;
     virtual bool destroy() = 0;
     virtual bool swapBuffers() = 0;
+
+    // The follow two functions are for managing a context that renders offscreen.
+
+    // Resizes the backing store used for offscreen rendering.
+    virtual void resizeOffscreenContent(const WebSize&) = 0;
+
+    // Returns the ID of the texture used for offscreen rendering in the context of the parent.
+    virtual unsigned getOffscreenContentParentTextureId() = 0;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBCallbacks.h b/WebKit/chromium/public/WebIDBCallbacks.h
index 0e28961..cee8612 100644
--- a/WebKit/chromium/public/WebIDBCallbacks.h
+++ b/WebKit/chromium/public/WebIDBCallbacks.h
@@ -32,6 +32,7 @@ namespace WebKit {
 
 class WebIDBDatabase;
 class WebIDBDatabaseError;
+class WebIDBKey;
 class WebIDBIndex;
 class WebIDBObjectStore;
 class WebSerializedScriptValue;
@@ -45,6 +46,7 @@ public:
     virtual void onError(const WebIDBDatabaseError&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess() { WEBKIT_ASSERT_NOT_REACHED(); } // For "null".
     virtual void onSuccess(WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void onSuccess(const WebIDBKey&) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBIndex*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(WebIDBObjectStore*) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void onSuccess(const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); }
diff --git a/WebKit/chromium/public/WebIDBKey.h b/WebKit/chromium/public/WebIDBKey.h
new file mode 100644
index 0000000..876928a
--- /dev/null
+++ b/WebKit/chromium/public/WebIDBKey.h
@@ -0,0 +1,85 @@
+/*
+ * 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:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 WebIDBKey_h
+#define WebIDBKey_h
+
+#include "WebCommon.h"
+#include "WebPrivatePtr.h"
+#include "WebString.h"
+
+namespace WebCore { class IDBKey; }
+
+namespace WebKit {
+
+class WebIDBKey {
+public:
+    ~WebIDBKey();
+  
+    WEBKIT_API static WebIDBKey createNull();
+    WEBKIT_API static WebIDBKey createInvalid();
+
+    WebIDBKey(const WebString& string) { assign(string); }
+    WebIDBKey(int32_t number) { assign(number); }
+    WebIDBKey(const WebIDBKey& e) { assign(e); }
+    WebIDBKey& operator=(const WebIDBKey& e)
+    {
+        assign(e);
+        return *this;
+    }
+
+    WEBKIT_API void assign(const WebIDBKey&);
+    WEBKIT_API void assignNull();
+    WEBKIT_API void assign(const WebString&);
+    WEBKIT_API void assign(int32_t);
+    WEBKIT_API void assignInvalid();
+
+    enum Type {
+        NullType = 0,
+        StringType,
+        NumberType,
+        // Types not in WebCore::IDBKey:
+        InvalidType
+    };
+
+    WEBKIT_API Type type() const;
+    WEBKIT_API WebString string() const; // Only valid for StringType.
+    WEBKIT_API int32_t number() const; // Only valid for numberType.
+
+#if WEBKIT_IMPLEMENTATION
+    WebIDBKey(const WTF::PassRefPtr<WebCore::IDBKey>&);
+    WebIDBKey& operator=(const WTF::PassRefPtr<WebCore::IDBKey>&);
+    operator WTF::PassRefPtr<WebCore::IDBKey>() const;
+#endif
+
+private:
+    WebIDBKey() { }
+
+    WebPrivatePtr<WebCore::IDBKey> m_private;
+};
+
+} // namespace WebKit
+
+#endif // WebIDBKey_h
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index fead881..fb81fb9 100755
--- a/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/WebKit/chromium/public/WebIDBObjectStore.h
@@ -53,17 +53,29 @@ public:
         WEBKIT_ASSERT_NOT_REACHED();
         return WebDOMStringList();
     }
-    void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*)
+    virtual void get(const WebIDBKey& key, WebIDBCallbacks*)
+    {
+        WEBKIT_ASSERT_NOT_REACHED();
+    }
+    virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*)
+    {
+        WEBKIT_ASSERT_NOT_REACHED();
+    }
+    virtual void remove(const WebIDBKey& key, WebIDBCallbacks*)
+    {
+        WEBKIT_ASSERT_NOT_REACHED();
+    }
+    virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*)
     {
         WEBKIT_ASSERT_NOT_REACHED();
     }
     // Transfers ownership of the WebIDBIndex to the caller.
-    WebIDBIndex* index(const WebString& name)
+    virtual WebIDBIndex* index(const WebString& name)
     {
         WEBKIT_ASSERT_NOT_REACHED();
         return 0;
     }
-    void removeIndex(const WebString& name, WebIDBCallbacks*)
+    virtual void removeIndex(const WebString& name, WebIDBCallbacks*)
     {
         WEBKIT_ASSERT_NOT_REACHED();
     }
diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h
index 95f8aa7..d8c8ce7 100644
--- a/WebKit/chromium/public/WebInputElement.h
+++ b/WebKit/chromium/public/WebInputElement.h
@@ -80,6 +80,7 @@ namespace WebKit {
         };
 
         WEBKIT_API bool autoComplete() const;
+        WEBKIT_API bool isReadOnly() const;
         WEBKIT_API bool isEnabledFormControl() const;
         WEBKIT_API InputType inputType() const;
         WEBKIT_API int maxLength() const;
@@ -88,12 +89,16 @@ namespace WebKit {
         WEBKIT_API int size() const;
         WEBKIT_API void setValue(const WebString&);
         WEBKIT_API WebString value() const;
+        WEBKIT_API void setSuggestedValue(const WebString&);
+        WEBKIT_API WebString suggestedValue() const;
         WEBKIT_API void setPlaceholder(const WebString&);
         WEBKIT_API WebString placeholder() const;
         WEBKIT_API bool isAutofilled() const;
         WEBKIT_API void setAutofilled(bool);
         WEBKIT_API void dispatchFormControlChangeEvent();
         WEBKIT_API void setSelectionRange(int, int);
+        WEBKIT_API int selectionStart();
+        WEBKIT_API int selectionEnd();
 
 #if WEBKIT_IMPLEMENTATION
         WebInputElement(const WTF::PassRefPtr<WebCore::HTMLInputElement>&);
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index c7aa8ef..fb0a99e 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -61,7 +61,10 @@ public:
     WEBKIT_API void assign(const WebNode&);
 
     WEBKIT_API bool equals(const WebNode&) const;
-
+    // Required for using WebNodes in std maps.  Note the order used is
+    // arbitrary and should not be expected to have any specific meaning.
+    WEBKIT_API bool lessThan(const WebNode&) const;
+    
     bool isNull() const { return m_private.isNull(); }
 
     enum NodeType {
@@ -124,7 +127,6 @@ public:
     operator WTF::PassRefPtr<WebCore::Node>() const;
 #endif
 
-protected:
 #if WEBKIT_IMPLEMENTATION
     template<typename T> T* unwrap()
     {
@@ -137,6 +139,7 @@ protected:
     }
 #endif
 
+protected:
     WebPrivatePtr<WebCore::Node> m_private;
 };
 
@@ -150,6 +153,11 @@ inline bool operator!=(const WebNode& a, const WebNode& b)
     return !(a == b);
 }
 
+inline bool operator<(const WebNode& a, const WebNode& b)
+{
+    return a.lessThan(b);
+}
+
 } // namespace WebKit
 
 #endif
diff --git a/WebKit/chromium/public/WebPlugin.h b/WebKit/chromium/public/WebPlugin.h
index 57f1cba..8e1c946 100644
--- a/WebKit/chromium/public/WebPlugin.h
+++ b/WebKit/chromium/public/WebPlugin.h
@@ -50,6 +50,9 @@ struct WebRect;
 struct WebURLError;
 template <typename T> class WebVector;
 
+// FIXME: remove once the chromium is updated.
+#define WEBPLUGIN_FIND_HAS_RETURN_TYPE
+
 class WebPlugin {
 public:
     virtual bool initialize(WebPluginContainer*) = 0;
@@ -94,7 +97,23 @@ public:
     // Ends the print operation.
     virtual void printEnd() { }
 
-    virtual WebString selectedText() { return WebString(); }
+    virtual bool hasSelection() const { return false; }
+    virtual WebString selectionAsText() const { return WebString(); }
+    virtual WebString selectionAsMarkup() const { return WebString(); }
+
+    // Used for zooming of full page plugins.
+    virtual void setZoomFactor(float scale, bool textOnly) { }
+
+    // Find interface.
+    // Start a new search.  The plugin should search for a little bit at a time so that it
+    // doesn't block the thread in case of a large document.  The results, along with the
+    // find's identifier, should be sent asynchronously to WebFrameClient's reportFindInPage* methods.
+    // Returns true if the search started, or false if the plugin doesn't support search.
+    virtual bool startFind(const WebString& searchText, bool caseSensitive, int identifier) { return false; }
+    // Tells the plugin to jump forward or backward in the list of find results.
+    virtual void selectFindResult(bool forward) { }
+    // Tells the plugin that the user has stopped the find operation.
+    virtual void stopFind() { }
 
 protected:
     ~WebPlugin() { }
diff --git a/WebKit/chromium/public/WebSerializedScriptValue.h b/WebKit/chromium/public/WebSerializedScriptValue.h
index dbcb92a..96e6d5b 100644
--- a/WebKit/chromium/public/WebSerializedScriptValue.h
+++ b/WebKit/chromium/public/WebSerializedScriptValue.h
@@ -53,6 +53,9 @@ public:
 
     WEBKIT_API static WebSerializedScriptValue fromString(const WebString&);
 
+    // Create a WebSerializedScriptValue that represents a serialization error.
+    WEBKIT_API static WebSerializedScriptValue createInvalid();
+
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebSerializedScriptValue&);
 
diff --git a/WebKit/chromium/public/WebURLLoadTiming.h b/WebKit/chromium/public/WebURLLoadTiming.h
new file mode 100644
index 0000000..9412d14
--- /dev/null
+++ b/WebKit/chromium/public/WebURLLoadTiming.h
@@ -0,0 +1,108 @@
+/*
+ * 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 WebURLLoadTiming_h
+#define WebURLLoadTiming_h
+
+#include "WebCommon.h"
+#include "WebPrivatePtr.h"
+
+namespace WebCore { class ResourceLoadTiming; }
+
+namespace WebKit {
+class WebString;
+
+class WebURLLoadTiming {
+public:
+    ~WebURLLoadTiming() { reset(); }
+
+    WebURLLoadTiming() { }
+    WebURLLoadTiming(const WebURLLoadTiming& d) { assign(d); }
+    WebURLLoadTiming& operator=(const WebURLLoadTiming& d)
+    {
+        assign(d);
+        return *this;
+    }
+
+    WEBKIT_API void initialize();
+    WEBKIT_API void reset();
+    WEBKIT_API void assign(const WebURLLoadTiming&);
+
+    bool isNull() const { return m_private.isNull(); }
+
+    WEBKIT_API double requestTime() const;
+    WEBKIT_API void setRequestTime(double time);
+
+    WEBKIT_API int proxyStart() const;
+    WEBKIT_API void setProxyStart(int start);
+
+    WEBKIT_API int proxyEnd() const;
+    WEBKIT_API void setProxyEnd(int end);
+
+    WEBKIT_API int dnsStart() const;
+    WEBKIT_API void setDNSStart(int start);
+
+    WEBKIT_API int dnsEnd() const;
+    WEBKIT_API void setDNSEnd(int end);
+
+    WEBKIT_API int connectStart() const;
+    WEBKIT_API void setConnectStart(int start);
+
+    WEBKIT_API int connectEnd() const;
+    WEBKIT_API void setConnectEnd(int end);
+
+    WEBKIT_API int sendStart() const;
+    WEBKIT_API void setSendStart(int start);
+
+    WEBKIT_API int sendEnd() const;
+    WEBKIT_API void setSendEnd(int end);
+
+    WEBKIT_API int receiveHeadersEnd() const;
+    WEBKIT_API void setReceiveHeadersEnd(int end);
+
+    WEBKIT_API int sslStart() const;
+    WEBKIT_API void setSSLStart(int start);
+
+    WEBKIT_API int sslEnd() const;
+    WEBKIT_API void setSSLEnd(int end);
+
+#if WEBKIT_IMPLEMENTATION
+    WebURLLoadTiming(const WTF::PassRefPtr<WebCore::ResourceLoadTiming>&);
+    WebURLLoadTiming& operator=(const WTF::PassRefPtr<WebCore::ResourceLoadTiming>&);
+    operator WTF::PassRefPtr<WebCore::ResourceLoadTiming>() const;
+#endif
+
+private:
+    WebPrivatePtr<WebCore::ResourceLoadTiming> m_private;
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/public/WebURLRequest.h b/WebKit/chromium/public/WebURLRequest.h
index 408aad7..b60d5be 100644
--- a/WebKit/chromium/public/WebURLRequest.h
+++ b/WebKit/chromium/public/WebURLRequest.h
@@ -69,7 +69,8 @@ public:
         TargetIsObject = 7,
         TargetIsMedia = 8,
         TargetIsWorker = 9,
-        TargetIsSharedWorker = 10
+        TargetIsSharedWorker = 10,
+        TargetIsPrefetch = 11,
     };
 
     ~WebURLRequest() { reset(); }
@@ -129,6 +130,10 @@ public:
     WEBKIT_API bool reportUploadProgress() const;
     WEBKIT_API void setReportUploadProgress(bool);
 
+    // Controls whether load timing info is collected for the request.
+    WEBKIT_API bool reportLoadTiming() const;
+    WEBKIT_API void setReportLoadTiming(bool);
+
     WEBKIT_API TargetType targetType() const;
     WEBKIT_API void setTargetType(TargetType);
 
diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index 293d955..2aa603d 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -43,6 +43,7 @@ class WebCString;
 class WebHTTPHeaderVisitor;
 class WebString;
 class WebURL;
+class WebURLLoadTiming;
 class WebURLResponsePrivate;
 
 class WebURLResponse {
@@ -72,6 +73,12 @@ public:
     WEBKIT_API WebURL url() const;
     WEBKIT_API void setURL(const WebURL&);
 
+    WEBKIT_API unsigned connectionID() const;
+    WEBKIT_API void setConnectionID(unsigned);
+
+    WEBKIT_API WebURLLoadTiming loadTiming();
+    WEBKIT_API void setLoadTiming(const WebURLLoadTiming&);
+
     WEBKIT_API double responseTime() const;
     WEBKIT_API void setResponseTime(double);
 
@@ -121,6 +128,10 @@ public:
     const WebCore::ResourceResponse& toResourceResponse() const;
 #endif
 
+    // Flag whether this request was served from the disk cache entry.
+    WEBKIT_API bool wasCached() const;
+    WEBKIT_API void setWasCached(bool);
+
     // Flag whether this request was loaded via the SPDY protocol or not.
     // SPDY is an experimental web protocol, see http://dev.chromium.org/spdy
     WEBKIT_API bool wasFetchedViaSPDY() const;
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 1efd752..a8f5387 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -54,6 +54,18 @@ struct WebPoint;
 
 class WebView : public WebWidget {
 public:
+    // Controls the time that user scripts injected into the document run.
+    enum UserScriptInjectAt {
+        UserScriptInjectAtDocumentStart,
+        UserScriptInjectAtDocumentEnd
+    };
+
+    // Controls which frames user content is injected into.
+    enum UserContentInjectIn {
+        UserContentInjectInAllFrames,
+        UserContentInjectInTopFrameOnly
+    };
+
     // Initialization ------------------------------------------------------
 
     // Creates a WebView that is NOT yet initialized.  You will need to
@@ -286,18 +298,22 @@ public:
     // FIXME: These two methods are DEPRECATED. Remove once Chromium has been rolled.
     virtual void addUserScript(const WebString& sourceCode, bool runAtStart)
     {
-        addUserScript(sourceCode, WebVector<WebString>(), runAtStart);
+        addUserScript(sourceCode, WebVector<WebString>(),
+                      runAtStart ? UserScriptInjectAtDocumentStart : UserScriptInjectAtDocumentEnd,
+                      UserContentInjectInAllFrames);
     }
     virtual void addUserStyleSheet(const WebString& sourceCode)
     {
-        addUserStyleSheet(sourceCode, WebVector<WebString>());
+        addUserStyleSheet(sourceCode, WebVector<WebString>(), UserContentInjectInAllFrames);
     }
 
     WEBKIT_API static void addUserScript(const WebString& sourceCode,
                                          const WebVector<WebString>& patterns,
-                                         bool runAtStart);
+                                         UserScriptInjectAt injectAt,
+                                         UserContentInjectIn injectIn);
     WEBKIT_API static void addUserStyleSheet(const WebString& sourceCode,
-                                             const WebVector<WebString>& patterns);
+                                             const WebVector<WebString>& patterns,
+                                             UserContentInjectIn injectIn);
     WEBKIT_API static void removeAllUserContent();
 
     // Modal dialog support ------------------------------------------------
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index a59289d..f21d262 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -45,10 +45,13 @@ namespace WebKit {
 
 class WebAccessibilityObject;
 class WebDragData;
+class WebElement;
 class WebFileChooserCompletion;
 class WebFrame;
 class WebGeolocationService;
 class WebImage;
+class WebInputElement;
+class WebKeyboardEvent;
 class WebNode;
 class WebNotificationPresenter;
 class WebRange;
@@ -132,6 +135,12 @@ public:
     virtual void didExecuteCommand(const WebString& commandName) { }
     virtual void didEndEditing() { }
 
+    // These methods are called when the users edits a text-field.
+    virtual void textFieldDidBeginEditing(const WebInputElement&) { }
+    virtual void textFieldDidEndEditing(const WebInputElement&) { }
+    virtual void textFieldDidChange(const WebInputElement&) { }
+    virtual void textFieldDidReceiveKeyDown(const WebInputElement&, const WebKeyboardEvent&) { }
+
     // This method is called in response to WebView's handleInputEvent()
     // when the default action for the current keyboard event is not
     // suppressed by the page, to give the embedder a chance to handle
@@ -312,6 +321,11 @@ public:
     // keys to navigate outside the range of possible selections.
     virtual void didClearAutoFillSelection(const WebNode&) { }
 
+    // Informs the browser that the user has selected an autocomplete (password
+    // or field) suggestion from the drop-down.  The input element text has
+    // already been set to the selected suggestion.
+    virtual void didAcceptAutocompleteSuggestion(const WebInputElement&) { }
+
     // Geolocation ---------------------------------------------------------
 
     // Access the embedder API for geolocation services.