Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

21 files changed, 224 insertions, 88 deletions

diff --git a/WebKit/chromium/public/WebCommonWorkerClient.h b/WebKit/chromium/public/WebCommonWorkerClient.h
index 13603cb..cea6471 100644
--- a/WebKit/chromium/public/WebCommonWorkerClient.h
+++ b/WebKit/chromium/public/WebCommonWorkerClient.h
@@ -35,6 +35,7 @@ namespace WebKit {
 
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebFrame;
 class WebNotificationPresenter;
 class WebString;
 class WebWorker;
@@ -79,6 +80,9 @@ public:
     // Called on the main webkit thread in the worker process during initialization.
     virtual WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) = 0;
 
+    // Called on the main webkit thread before opening a web database.
+    virtual bool allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) = 0;
+
 protected:
     ~WebCommonWorkerClient() { }
 };
diff --git a/WebKit/chromium/public/WebContextMenuData.h b/WebKit/chromium/public/WebContextMenuData.h
index 25036d4..8ed1f1b 100644
--- a/WebKit/chromium/public/WebContextMenuData.h
+++ b/WebKit/chromium/public/WebContextMenuData.h
@@ -134,6 +134,17 @@ struct WebContextMenuData {
 
     // Custom context menu items provided by the WebCore internals.
     WebVector<WebMenuItemInfo> customItems;
+
+    WebContextMenuData()
+        : mediaType(MediaTypeNone)
+        , isImageBlocked(false)
+        , mediaFlags(MediaNone)
+        , isSpellCheckingEnabled(false)
+        , isEditable(false)
+        , writingDirectionDefault(CheckableMenuItemDisabled)
+        , writingDirectionLeftToRight(CheckableMenuItemEnabled)
+        , writingDirectionRightToLeft(CheckableMenuItemEnabled)
+        , editFlags(0) { }
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index f112446..772db75 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -462,21 +462,16 @@ public:
     // Registers a listener for the specified user name input element. The
     // listener will receive notifications for blur and when autocomplete
     // should be triggered.
-    // The WebFrame becomes the owner of the passed listener.
-    virtual void registerPasswordListener(
+    // An element can have only one listener. If a listener already exists,
+    // this method returns false and does not add the new one.
+    // Either way, the WebFrame becomes the owner of the passed listener.
+    virtual bool registerPasswordListener(
         WebInputElement,
         WebPasswordAutocompleteListener*) = 0;
 
 
     // Utility -------------------------------------------------------------
 
-    // Given a relative URL, returns an absolute URL by resolving the URL
-    // relative to the base URL of the frame's document.  This uses the
-    // same algorithm that WebKit uses to resolve hyperlinks found in a
-    // HTML document.
-    // Deprecated. Use document().completeURL() instead.
-    virtual WebURL completeURL(const WebString&) const = 0;
-
     // Returns the contents of this frame as a string.  If the text is
     // longer than maxChars, it will be clipped to that length.  WARNING:
     // This function may be slow depending on the number of characters
diff --git a/WebKit/chromium/public/WebIDBCallbacks.h b/WebKit/chromium/public/WebIDBCallbacks.h
index 9e85aa8..610f7d4 100644
--- a/WebKit/chromium/public/WebIDBCallbacks.h
+++ b/WebKit/chromium/public/WebIDBCallbacks.h
@@ -33,22 +33,19 @@
 
 namespace WebKit {
 
+class WebIDBDatabase;
 class WebIDBDatabaseError;
+class WebSerializedScriptValue;
 
-// Every IndexedDB method takes in a pair of callbacks for error/success which
-// implement this class.  Either 0 or 1 of these methods will be called and the
-// callback class may be deleted any time after the callback is called.
-template <typename ResultType>
 class WebIDBCallbacks {
 public:
     virtual ~WebIDBCallbacks() { }
 
-    // If the method was a success, this method is called with the result.  The
-    // result is a pointer that the callback takes ownership of.
-    virtual void onSuccess(ResultType*) = 0;
-
-    // Called in the event of an error.
+    // For classes that follow the PImpl pattern, pass a const reference.
+    // For the rest, pass ownership to the callee via a pointer.
     virtual void onError(const WebIDBDatabaseError&) = 0;
+    virtual void onSuccess(WebIDBDatabase*) = 0;
+    virtual void onSuccess(const WebSerializedScriptValue&) = 0;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebIndexedDatabase.h b/WebKit/chromium/public/WebIndexedDatabase.h
index bb75170..8861456 100644
--- a/WebKit/chromium/public/WebIndexedDatabase.h
+++ b/WebKit/chromium/public/WebIndexedDatabase.h
@@ -47,7 +47,8 @@ public:
 
     virtual ~WebIndexedDatabase() { }
 
-    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase, WebIDBCallbacks<WebIDBDatabase>*, WebFrame*, int& exceptionCode) = 0;
+    // The WebKit implementation of open ignores the WebFrame* parameter.
+    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase, WebIDBCallbacks*, const WebString& origin, WebFrame*, int& exceptionCode) = 0;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h
index a7a71b0..0de96a7 100644
--- a/WebKit/chromium/public/WebInputElement.h
+++ b/WebKit/chromium/public/WebInputElement.h
@@ -85,6 +85,7 @@ namespace WebKit {
         WEBKIT_API int maxLength() const;
         WEBKIT_API bool isActivatedSubmit() const;
         WEBKIT_API void setActivatedSubmit(bool);
+        WEBKIT_API int size() const;
         WEBKIT_API void setValue(const WebString& value);
         WEBKIT_API WebString value() const;
         WEBKIT_API void setAutofilled(bool);
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 97d25a8..584679d 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -135,7 +135,7 @@ public:
     // Opens a database file; dirHandle should be 0 if the caller does not need
     // a handle to the directory containing this file
     virtual FileHandle databaseOpenFile(
-        const WebString& vfsFileName, int desiredFlags, FileHandle* dirHandle) { return FileHandle(); }
+        const WebString& vfsFileName, int desiredFlags) { return FileHandle(); }
 
     // Deletes a database file and returns the error code
     virtual int databaseDeleteFile(const WebString& vfsFileName, bool syncDir) { return 0; }
@@ -192,6 +192,9 @@ public:
     // Returns the User-Agent string that should be used for the given URL.
     virtual WebString userAgent(const WebURL&) { return WebString(); }
 
+    // A suggestion to cache this metadata in association with this URL.
+    virtual void cacheMetadata(const WebURL&, double responseTime, const char* data, size_t dataSize) { }
+
 
     // Plugins -------------------------------------------------------------
 
diff --git a/WebKit/chromium/public/WebMediaPlayerClient.h b/WebKit/chromium/public/WebMediaPlayerClient.h
index 47ce64e..7e5dd68 100644
--- a/WebKit/chromium/public/WebMediaPlayerClient.h
+++ b/WebKit/chromium/public/WebMediaPlayerClient.h
@@ -48,6 +48,7 @@ public:
     virtual void rateChanged() = 0;
     virtual void sizeChanged() = 0;
     virtual void sawUnsupportedTracks() = 0;
+    virtual float volume() const = 0;
 
 protected:
     ~WebMediaPlayerClient() { }
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index 792ede5..c7aa8ef 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -84,8 +84,6 @@ public:
     WEBKIT_API WebString nodeName() const;
     WEBKIT_API WebString nodeValue() const;
     WEBKIT_API bool setNodeValue(const WebString&);
-    // Deprecated. Use document().frame() instead.
-    WEBKIT_API WebFrame* frame() const;
     WEBKIT_API WebDocument document() const;
     WEBKIT_API WebNode firstChild() const;
     WEBKIT_API WebNode lastChild() const;
@@ -106,22 +104,6 @@ public:
     // Note: This method only works properly after layout has occurred.
     WEBKIT_API bool hasNonEmptyBoundingBox() const;
 
-    // Deprecated. Use to() instead.
-    template<typename T> T toElement()
-    {
-        T res;
-        res.WebNode::assign(*this);
-        return res;
-    }
-
-    // Deprecated. Use toConst() instead.
-    template<typename T> const T toConstElement() const
-    {
-        T res;
-        res.WebNode::assign(*this);
-        return res;
-    }
-
     template<typename T> T to()
     {
         T res;
diff --git a/WebKit/chromium/public/WebPasswordAutocompleteListener.h b/WebKit/chromium/public/WebPasswordAutocompleteListener.h
index db6589d..fdc8476 100644
--- a/WebKit/chromium/public/WebPasswordAutocompleteListener.h
+++ b/WebKit/chromium/public/WebPasswordAutocompleteListener.h
@@ -49,5 +49,4 @@ public:
 
 } // namespace WebKit
 
-
 #endif
diff --git a/WebKit/chromium/public/WebPluginContainer.h b/WebKit/chromium/public/WebPluginContainer.h
index 41e304e..7b23f08 100644
--- a/WebKit/chromium/public/WebPluginContainer.h
+++ b/WebKit/chromium/public/WebPluginContainer.h
@@ -35,6 +35,7 @@ struct NPObject;
 
 namespace WebKit {
 
+class WebElement;
 class WebString;
 class WebURL;
 class WebURLRequest;
@@ -42,6 +43,9 @@ struct WebRect;
 
 class WebPluginContainer {
 public:
+    // Returns the element containing this plugin.
+    virtual WebElement element() = 0;
+
     virtual void invalidate() = 0;
     virtual void invalidateRect(const WebRect&) = 0;
 
diff --git a/WebKit/chromium/public/WebPopupMenuInfo.h b/WebKit/chromium/public/WebPopupMenuInfo.h
index 7eb132e..7cf1b63 100644
--- a/WebKit/chromium/public/WebPopupMenuInfo.h
+++ b/WebKit/chromium/public/WebPopupMenuInfo.h
@@ -44,6 +44,7 @@ struct WebPopupMenuInfo {
     int itemFontSize;
     int selectedIndex;
     WebVector<WebMenuItemInfo> items;
+    bool rightAligned;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebScrollbar.h b/WebKit/chromium/public/WebScrollbar.h
new file mode 100644
index 0000000..6941f4d
--- /dev/null
+++ b/WebKit/chromium/public/WebScrollbar.h
@@ -0,0 +1,98 @@
+/*
+ * 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 WebScrollbar_h
+#define WebScrollbar_h
+
+#include "WebCanvas.h"
+#include "WebCommon.h"
+
+namespace WebKit {
+
+class WebInputEvent;
+class WebScrollbarClient;
+struct WebRect;
+
+class WebScrollbar {
+public:
+    enum Orientation {
+        Horizontal,
+        Vertical
+    };
+
+    enum ScrollDirection {
+        ScrollBackward,
+        ScrollForward
+    };
+
+    enum ScrollGranularity {
+        ScrollByLine,
+        ScrollByPage,
+        ScrollByDocument,
+        ScrollByPixel
+    };
+
+    // Creates a WebScrollbar.
+    WEBKIT_API static WebScrollbar* create(WebScrollbarClient*, Orientation);
+
+    virtual ~WebScrollbar() {}
+
+    // Gets the thickness of the scrollbar in pixels.
+    WEBKIT_API static int defaultThickness();
+
+    // Sets the rectangle of the scrollbar.
+    virtual void setLocation(const WebRect&) = 0;
+
+    // Gets the current value (i.e. position inside the region).
+    virtual int value() const = 0;
+
+    // Sets the current value.
+    virtual void setValue(int position) = 0;
+
+    // Sets the size of the scrollable region in pixels.  i.e. if a document is
+    // 800x10000 pixels and the viewport is 1000x1000 pixels, then setLocation
+    // for the vertical scrollbar would have passed in a rectangle like:
+    //            (800 - defaultThickness(), 0) (defaultThickness() x 10000)
+    // and setDocumentSize(10000)
+    virtual void setDocumentSize(int size) = 0;
+
+    // Scroll back or forward with the given granularity.
+    virtual void scroll(ScrollDirection, ScrollGranularity, float multiplier) = 0;
+
+    // Paint the given rectangle.
+    virtual void paint(WebCanvas*, const WebRect&) = 0;
+
+    // Returns true iff the given event was used.
+    virtual bool handleInputEvent(const WebInputEvent&) = 0;
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/public/WebScrollbarClient.h b/WebKit/chromium/public/WebScrollbarClient.h
new file mode 100644
index 0000000..d1825c8
--- /dev/null
+++ b/WebKit/chromium/public/WebScrollbarClient.h
@@ -0,0 +1,49 @@
+/*
+ * 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 WebScrollbarClient_h
+#define WebScrollbarClient_h
+
+namespace WebKit {
+
+class WebScrollbar;
+struct WebRect;
+template <typename T> class WebVector;
+
+class WebScrollbarClient {
+public:
+    virtual void valueChanged(WebScrollbar*) = 0;
+    virtual void invalidateScrollbarRect(WebScrollbar*, const WebRect&) = 0;
+    virtual void getTickmarks(WebScrollbar*, WebVector<WebRect>*) const = 0;
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/public/WebSecurityPolicy.h b/WebKit/chromium/public/WebSecurityPolicy.h
index ac0031d..f15dd75 100644
--- a/WebKit/chromium/public/WebSecurityPolicy.h
+++ b/WebKit/chromium/public/WebSecurityPolicy.h
@@ -62,12 +62,6 @@ public:
         const WebURL& sourceOrigin, const WebString& destinationProtocol,
         const WebString& destinationHost, bool allowDestinationSubdomains);
     WEBKIT_API static void resetOriginAccessWhitelists();
-    // DEPRECATED: Phase on of renaming to addOriginAccessWhitelistEntry.
-    WEBKIT_API static void whiteListAccessFromOrigin(
-        const WebURL& sourceOrigin, const WebString& destinationProtocol,
-        const WebString& destinationHost, bool allowDestinationSubdomains);
-    // DEPRECATED: Phase on of renaming to resetOriginAccessWhitelists..
-    WEBKIT_API static void resetOriginAccessWhiteLists();
     
     // Returns whether the url should be allowed to see the referrer
     // based on their respective protocols.
diff --git a/WebKit/chromium/public/WebSharedWorker.h b/WebKit/chromium/public/WebSharedWorker.h
index 4ac7639..01c8391 100644
--- a/WebKit/chromium/public/WebSharedWorker.h
+++ b/WebKit/chromium/public/WebSharedWorker.h
@@ -60,7 +60,18 @@ public:
     virtual void startWorkerContext(const WebURL& scriptURL,
                                     const WebString& name,
                                     const WebString& userAgent,
-                                    const WebString& sourceCode) = 0;
+                                    const WebString& sourceCode,
+                                    long long scriptResourceAppCacheID) = 0;
+
+    // FIXME(michaeln): Remove this after the roll and adjusting to it.
+    virtual void startWorkerContext(const WebURL& scriptURL,
+                                    const WebString& name,
+                                    const WebString& userAgent,
+                                    const WebString& sourceCode)
+    {
+        startWorkerContext(scriptURL, name, userAgent, sourceCode, 0);
+    }
+
     class ConnectListener {
     public:
         // Invoked once the connect event has been sent so the caller can free this object.
diff --git a/WebKit/chromium/public/WebStorageNamespace.h b/WebKit/chromium/public/WebStorageNamespace.h
index 4b648d4..51d4e0b 100644
--- a/WebKit/chromium/public/WebStorageNamespace.h
+++ b/WebKit/chromium/public/WebStorageNamespace.h
@@ -49,10 +49,14 @@ public:
     // object when you're finished.
     WEBKIT_API static WebStorageNamespace* createLocalStorageNamespace(const WebString& backingDirectoryPath, unsigned quota);
     WEBKIT_API static WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
-    WEBKIT_API static WebStorageNamespace* createSessionStorageNamespace()
-    {
-        return createSessionStorageNamespace(noQuota);
-    }
+
+    // The quota for each storage area.  Suggested by the spec.
+    static const unsigned m_localStorageQuota = 5 * 1024 * 1024;
+
+    // Since SessionStorage memory is allocated in the browser process, we place a
+    // per-origin quota on it.  Like LocalStorage there are known attacks against
+    // this, so it's more of a sanity check than a real security measure.
+    static const unsigned m_sessionStorageQuota = 5 * 1024 * 1024;
 
     static const unsigned noQuota = UINT_MAX;
 
diff --git a/WebKit/chromium/public/WebThemeEngine.h b/WebKit/chromium/public/WebThemeEngine.h
index 1fccb0e..606de09 100644
--- a/WebKit/chromium/public/WebThemeEngine.h
+++ b/WebKit/chromium/public/WebThemeEngine.h
@@ -75,45 +75,12 @@ public:
     virtual void paintTrackbar(
         WebCanvas*, int part, int state, int classicState,
         const WebRect&) = 0;
-#endif
-
-    // WebThemeEngine was originally used only on Windows, hence its platform-
-    // specific parameters.  This is new cross-platform theming API, and we'll
-    // switch the code to using these APIs on all platforms instead.
-    enum Part {
-        PartScrollbarDownArrow,
-        PartScrollbarLeftArrow,
-        PartScrollbarRightArrow,
-        PartScrollbarUpArrow,
-        PartScrollbarHorizontalThumb,
-        PartScrollbarVerticalThumb,
-        PartScrollbarHoriztonalTrack,
-        PartScrollbarVerticalTrack,
-    };
-
-    enum State {
-        StateDisabled,
-        StateHot,
-        StateHover,
-        StateNormal,
-        StatePressed,
-    };
 
-    struct ScrollbarTrackExtraParams {
-        int alignX;
-        int alignY;
-    };
+    virtual void paintProgressBar(
+        WebCanvas*, const WebRect& barRect, 
+        int valuePart, const WebRect& valueRect) {}
 
-    union ExtraParams {
-        ScrollbarTrackExtraParams scrollbarTrack;
-    };
-
-    // Gets the size of the given theme component.  For variable sized items
-    // like vertical scrollbar tracks, the width will be the required width of
-    // the track while the height will be the minimum height.
-    virtual void getSize(Part, WebSize*) {}
-    virtual void paint(
-        WebCanvas*, Part, State, const WebRect&, const ExtraParams&) {}
+#endif
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebURLLoaderClient.h b/WebKit/chromium/public/WebURLLoaderClient.h
index 03b2c54..a66b153 100644
--- a/WebKit/chromium/public/WebURLLoaderClient.h
+++ b/WebKit/chromium/public/WebURLLoaderClient.h
@@ -56,6 +56,9 @@ public:
     // Called when a chunk of response data is received.
     virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength) = 0;
 
+    // Called when a chunk of renderer-generated metadata is received from the cache.
+    virtual void didReceiveCachedMetadata(WebURLLoader*, const char* data, int dataLength) { }
+
     // Called when the load completes successfully.
     virtual void didFinishLoading(WebURLLoader*) = 0;
 
diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index 3acacf8..b3c084c 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -72,6 +72,9 @@ public:
     WEBKIT_API WebURL url() const;
     WEBKIT_API void setURL(const WebURL&);
 
+    WEBKIT_API double responseTime() const;
+    WEBKIT_API void setResponseTime(double);
+
     WEBKIT_API WebString mimeType() const;
     WEBKIT_API void setMIMEType(const WebString&);
 
@@ -123,6 +126,11 @@ public:
     WEBKIT_API bool wasFetchedViaSPDY() const;
     WEBKIT_API void setWasFetchedViaSPDY(bool);
 
+    // Flag whether this request was loaded after the TLS/Next-Protocol-Negotiation was used.
+    // This is related to SPDY.
+    WEBKIT_API bool wasNpnNegotiated() const;
+    WEBKIT_API void setWasNpnNegotiated(bool);
+
     // Flag whether this request is part of a multipart response.
     WEBKIT_API bool isMultipartPayload() const;
     WEBKIT_API void setIsMultipartPayload(bool);
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 98e0485..9478df9 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -81,7 +81,7 @@ public:
     virtual WebWidget* createPopupMenu(const WebPopupMenuInfo&) { return 0; }
 
     // Create a session storage namespace object associated with this WebView.
-    virtual WebStorageNamespace* createSessionStorageNamespace() { return 0; }
+    virtual WebStorageNamespace* createSessionStorageNamespace(unsigned quota) { return 0; }
 
     // Misc ----------------------------------------------------------------
 
@@ -234,6 +234,9 @@ public:
     virtual void focusNext() { }
     virtual void focusPrevious() { }
 
+    // Called when a new node gets focused.
+    virtual void focusedNodeChanged(const WebNode&) { }
+
 
     // Session history -----------------------------------------------------