Merge webkit.org at r54340 : Initial merge by git

Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44

7 files changed, 79 insertions, 32 deletions

diff --git a/WebKit/chromium/public/WebContextMenuData.h b/WebKit/chromium/public/WebContextMenuData.h
index b4acb1c..049da9c 100644
--- a/WebKit/chromium/public/WebContextMenuData.h
+++ b/WebKit/chromium/public/WebContextMenuData.h
@@ -97,6 +97,18 @@ struct WebContextMenuData {
     // Whether context is editable.
     bool isEditable;
 
+    enum CheckableMenuItemFlags {
+        CheckableMenuItemDisabled = 0x0,
+        CheckableMenuItemEnabled = 0x1,
+        CheckableMenuItemChecked = 0x2,
+    };
+
+    // Writing direction menu items.
+    // Currently only used on OS X.
+    int writingDirectionDefault;
+    int writingDirectionLeftToRight;
+    int writingDirectionRightToLeft;
+
     enum EditFlags {
         CanDoNone = 0x0,
         CanUndo = 0x1,
diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index 4197c23..a56e6cb 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -357,6 +357,11 @@ public:
     virtual WebString selectionAsText() const = 0;
     virtual WebString selectionAsMarkup() const = 0;
 
+    // Expands the selection to a word around the caret and returns
+    // true. Does nothing and returns false if there is no caret or
+    // there is ranged selection.
+    virtual bool selectWordAroundCaret() = 0;
+
 
     // Printing ------------------------------------------------------------
 
@@ -478,6 +483,13 @@ public:
     // used to support layout tests.
     virtual WebString counterValueForElementById(const WebString& id) const = 0;
 
+
+    // Returns the number of page where the specified element will be put.
+    // This method is used to support layout tests.
+    virtual int pageNumberForElementById(const WebString& id,
+                                         float pageWidthInPixels,
+                                         float pageHeightInPixels) const = 0;
+
 protected:
     ~WebFrame() { }
 };
diff --git a/WebKit/chromium/public/WebMediaPlayerClient.h b/WebKit/chromium/public/WebMediaPlayerClient.h
index 558fb4a..47ce64e 100644
--- a/WebKit/chromium/public/WebMediaPlayerClient.h
+++ b/WebKit/chromium/public/WebMediaPlayerClient.h
@@ -40,7 +40,8 @@ class WebMediaPlayerClient {
 public:
     virtual void networkStateChanged() = 0;
     virtual void readyStateChanged() = 0;
-    virtual void volumeChanged() = 0;
+    virtual void volumeChanged(float) = 0;
+    virtual void muteChanged(bool) = 0;
     virtual void timeChanged() = 0;
     virtual void repaint() = 0;
     virtual void durationChanged() = 0;
diff --git a/WebKit/chromium/public/WebSecurityOrigin.h b/WebKit/chromium/public/WebSecurityOrigin.h
index 7b04aac..1285b10 100644
--- a/WebKit/chromium/public/WebSecurityOrigin.h
+++ b/WebKit/chromium/public/WebSecurityOrigin.h
@@ -55,7 +55,9 @@ public:
         return *this;
     }
 
+    // FIXME: This should return a WebSecurityOrigin, not a pointer to one.
     WEBKIT_API static WebSecurityOrigin* createFromDatabaseIdentifier(const WebString& databaseIdentifier);
+    WEBKIT_API static WebSecurityOrigin createFromString(const WebString&);
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebSecurityOrigin&);
diff --git a/WebKit/chromium/public/WebStorageArea.h b/WebKit/chromium/public/WebStorageArea.h
index 302e10c..19d98c6 100644
--- a/WebKit/chromium/public/WebStorageArea.h
+++ b/WebKit/chromium/public/WebStorageArea.h
@@ -57,44 +57,17 @@ 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 we've
+    // 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.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException) // Deprecated.
-    {
-        WebString oldValue;
-        setItem(key, newValue, url, quotaException, oldValue);
-    }
-    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue)
-    {
-        setItem(key, newValue, url, quotaException);
-    }
+    virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& url, bool& quotaException, WebString& oldValue) = 0;
 
     // Remove the value associated with a particular key.  url is the url that should be used
     // if a storage event fires.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void removeItem(const WebString& key, const WebURL& url) // Deprecated.
-    {
-        WebString oldValue;
-        removeItem(key, url, oldValue);
-    }
-    virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue)
-    {
-        removeItem(key, url);
-    }
+    virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue) = 0;
 
     // Clear all key/value pairs.  url is the url that should be used if a storage event fires.
-    // FIXME: The following is a hack to keep Chromium compiling until the other half is landed.  Remove soon.
-    virtual void clear(const WebURL& url) // Deprecated.
-    {
-        bool somethingCleared;
-        clear(url, somethingCleared);
-    }
-    virtual void clear(const WebURL& url, bool& somethingCleared)
-    {
-        clear(url);
-    }
+    virtual void clear(const WebURL& url, bool& somethingCleared) = 0;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index aba556c..7b3294f 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -262,6 +262,10 @@ public:
                                     unsigned inactiveBackgroundColor,
                                     unsigned inactiveForegroundColor) = 0;
 
+    // User scripts --------------------------------------------------------
+    virtual void addUserScript(const WebString& sourceCode,
+                               bool runAtStart) = 0;
+    virtual void removeAllUserContent() = 0;
 
     // Modal dialog support ------------------------------------------------
 
diff --git a/WebKit/chromium/public/linux/WebRenderTheme.h b/WebKit/chromium/public/linux/WebRenderTheme.h
new file mode 100644
index 0000000..e3be69d
--- /dev/null
+++ b/WebKit/chromium/public/linux/WebRenderTheme.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2009 Joel Stanley. 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 WebRenderTheme_h
+#define WebRenderTheme_h
+
+#include "../WebCommon.h"
+
+namespace WebKit {
+
+// Set caret blink interval for text input areas.
+WEBKIT_API void setCaretBlinkInterval(double);
+
+} // namespace WebKit
+
+#endif