Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

9 files changed, 99 insertions, 25 deletions

diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h
index f46c0d8..191d40f 100644
--- a/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/WebKit/chromium/public/WebAccessibilityObject.h
@@ -94,10 +94,12 @@ public:
 
     WebRect boundingBoxRect() const;
     WebString helpText() const;
+    int headingLevel() const;
     WebAccessibilityObject hitTest(const WebPoint&) const;
     WebString keyboardShortcut() const;
     bool performDefaultAction() const;
     WebAccessibilityRole roleValue() const;
+    void setFocused(bool) const;
     WebString stringValue() const;
     WebString title() const;
 
diff --git a/WebKit/chromium/public/WebBindings.h b/WebKit/chromium/public/WebBindings.h
index 4e66a8f..0fa3bfd 100644
--- a/WebKit/chromium/public/WebBindings.h
+++ b/WebKit/chromium/public/WebBindings.h
@@ -117,7 +117,7 @@ public:
     // NPN_UTF8FromIdentifier
     WEBKIT_API static NPUTF8* utf8FromIdentifier(NPIdentifier);
 
-    // Miscellaneous utility functions ------------------------------------
+    // Miscellaneous utility functions ----------------------------------------
 
     // Complement to NPN_Get___Identifier functions.  Extracts data from the NPIdentifier data
     // structure.  If isString is true upon return, string will be set but number's value is
@@ -138,6 +138,15 @@ public:
     // Return true (success) if the given npobj is a range object.
     // If so, return that range as a WebRange object.
     WEBKIT_API static bool getRange(NPObject* range, WebRange*);
+
+    // Exceptions -------------------------------------------------------------
+
+    typedef void (ExceptionHandler)(void* data, const NPUTF8* message);
+
+    // The exception handler will be notified of any exceptions thrown while
+    // operating on a NPObject.
+    WEBKIT_API static void pushExceptionHandler(ExceptionHandler, void* data);
+    WEBKIT_API static void popExceptionHandler();
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebGeolocationServiceMock.h b/WebKit/chromium/public/WebGeolocationServiceMock.h
new file mode 100644
index 0000000..285f70c
--- /dev/null
+++ b/WebKit/chromium/public/WebGeolocationServiceMock.h
@@ -0,0 +1,60 @@
+/*
+ * 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 WebGeolocationServiceMock_h
+#define WebGeolocationServiceMock_h
+
+#include "WebGeolocationService.h"
+#include <wtf/HashMap.h>
+
+namespace WebKit {
+
+class WebString;
+
+class WebGeolocationServiceMock : public WebGeolocationService {
+public:
+    static void setMockGeolocationPermission(bool allowed);
+    static void setMockGeolocationPosition(double latitude, double longitude, double accuracy);
+    static void setMockGeolocationError(int errorCode, const WebString& message);
+
+    virtual void requestPermissionForFrame(int bridgeId, const WebURL& url);
+    virtual int attachBridge(WebGeolocationServiceBridge*);
+    virtual void detachBridge(int bridgeId);
+
+private:
+    typedef HashMap<int, WebGeolocationServiceBridge*> IdToBridgeMap;
+    IdToBridgeMap m_idToBridgeMap;
+
+    static bool s_mockGeolocationPermission;
+};
+
+} // namespace WebKit
+
+#endif // WebGeolocationServiceMock_h
diff --git a/WebKit/chromium/public/WebIndexedDatabase.h b/WebKit/chromium/public/WebIndexedDatabase.h
index 8861456..61b77a0 100644
--- a/WebKit/chromium/public/WebIndexedDatabase.h
+++ b/WebKit/chromium/public/WebIndexedDatabase.h
@@ -31,12 +31,15 @@
 
 #include "WebCommon.h"
 #include "WebIDBCallbacks.h"
+#include "WebSecurityOrigin.h"
+#include "WebString.h"
 
 namespace WebKit {
 
 class WebFrame;
 class WebIDBDatabase;
 class WebString;
+class WebSecurityOrigin;
 
 // The entry point into the IndexedDatabase API.  These classes match their _____Request and
 // _____Sync counterparts in the spec, but operate only in an async manner.
@@ -48,7 +51,17 @@ public:
     virtual ~WebIndexedDatabase() { }
 
     // 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;
+    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase,
+                      WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, int& exceptionCode)
+    {
+        open(name, description, modifyDatabase, callbacks, origin.toString(), webFrame, exceptionCode);
+    }
+    // FIXME: Delete soon.  Compatability hack.
+    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase,
+                      WebIDBCallbacks* callbacks, const WebString& origin, WebFrame* webFrame, int& exceptionCode)
+    {
+        open(name, description, modifyDatabase, callbacks, WebSecurityOrigin::createFromString(origin), webFrame, exceptionCode);
+    }
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 584679d..d1da883 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -95,23 +95,6 @@ public:
                                       const WebURL& url, bool isLocalStorage) { }
 
 
-    // File ----------------------------------------------------------------
-
-    // Various file/directory related functions.  These map 1:1 with
-    // functions in WebCore's FileSystem.h.
-    virtual bool fileExists(const WebString& path) { return false; }
-    virtual bool deleteFile(const WebString& path) { return false; }
-    virtual bool deleteEmptyDirectory(const WebString& path) { return false; }
-    virtual bool getFileSize(const WebString& path, long long& result) { return false; }
-    virtual bool getFileModificationTime(const WebString& path, double& result) { return false; }
-    virtual WebString directoryName(const WebString& path) { return WebString(); }
-    virtual WebString pathByAppendingComponent(const WebString& path, const WebString& component) { return WebString(); }
-    virtual bool makeAllDirectories(const WebString& path) { return false; }
-    virtual WebString getAbsolutePath(const WebString& path) { return WebString(); }
-    virtual bool isDirectory(const WebString& path) { return false; }
-    virtual WebURL filePathToURL(const WebString& path) { return WebURL(); }
-
-
     // History -------------------------------------------------------------
 
     // Returns the hash for the given canonicalized URL for use in visited
diff --git a/WebKit/chromium/public/WebNotification.h b/WebKit/chromium/public/WebNotification.h
index ab747e3..9d64e2a 100644
--- a/WebKit/chromium/public/WebNotification.h
+++ b/WebKit/chromium/public/WebNotification.h
@@ -75,9 +75,6 @@ public:
     WEBKIT_API WebString title() const;
     WEBKIT_API WebString body() const;
 
-    WEBKIT_API WebString dir() const;
-    WEBKIT_API WebString replaceId() const;
-
     // Called to indicate the notification has been displayed.
     WEBKIT_API void dispatchDisplayEvent();
 
diff --git a/WebKit/chromium/public/WebSecurityOrigin.h b/WebKit/chromium/public/WebSecurityOrigin.h
index 76012a1..efcb2e9 100644
--- a/WebKit/chromium/public/WebSecurityOrigin.h
+++ b/WebKit/chromium/public/WebSecurityOrigin.h
@@ -90,7 +90,11 @@ public:
 
     // Returns a string representation of this WebSecurityOrigin that can
     // be used as a file.  Should be used in storage APIs only.
-    WEBKIT_API WebString databaseIdentifier();
+    WEBKIT_API WebString databaseIdentifier() const;
+
+    // Returns true if this WebSecurityOrigin can access usernames and 
+    // passwords stored in password manager.
+    WEBKIT_API bool canAccessPasswordManager() const;
 
 #if WEBKIT_IMPLEMENTATION
     WebSecurityOrigin(const WTF::PassRefPtr<WebCore::SecurityOrigin>&);
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index 356d9fa..dd31ea0 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -43,6 +43,11 @@ class WebURL;
 // these functions have a 1:1 mapping with the methods in WebCore/page/settings.h.
 class WebSettings {
 public:
+    enum EditingBehavior {
+        EditingBehaviorMac,
+        EditingBehaviorWin
+    };
+
     virtual void setStandardFontFamily(const WebString&) = 0;
     virtual void setFixedFontFamily(const WebString&) = 0;
     virtual void setSerifFontFamily(const WebString&) = 0;
@@ -84,6 +89,7 @@ public:
     virtual void setOfflineWebApplicationCacheEnabled(bool) = 0;
     virtual void setExperimentalWebGLEnabled(bool) = 0;
     virtual void setShowDebugBorders(bool) = 0;
+    virtual void setEditingBehavior(EditingBehavior) = 0;
 
 protected:
     ~WebSettings() { }
diff --git a/WebKit/chromium/public/WebThemeEngine.h b/WebKit/chromium/public/WebThemeEngine.h
index 606de09..9638c2f 100644
--- a/WebKit/chromium/public/WebThemeEngine.h
+++ b/WebKit/chromium/public/WebThemeEngine.h
@@ -77,8 +77,8 @@ public:
         const WebRect&) = 0;
 
     virtual void paintProgressBar(
-        WebCanvas*, const WebRect& barRect, 
-        int valuePart, const WebRect& valueRect) {}
+        WebCanvas*, const WebRect& barRect, const WebRect& valueRect,
+        bool determinate, double animatedSeconds) {}
 
 #endif
 };