Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12

1 files changed, 11 insertions, 0 deletions

diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h
index 6725f58..5d41d10 100644
--- a/WebKit/chromium/public/WebFrame.h
+++ b/WebKit/chromium/public/WebFrame.h
@@ -56,6 +56,7 @@ class WebFormElement;
 class WebHistoryItem;
 class WebInputElement;
 class WebPasswordAutocompleteListener;
+class WebPerformance;
 class WebRange;
 class WebSecurityOrigin;
 class WebString;
@@ -193,6 +194,8 @@ public:
 
     virtual WebAnimationController* animationController() = 0;
 
+    virtual WebPerformance performance() const = 0;
+
 
     // Scripting ----------------------------------------------------------
 
@@ -352,6 +355,8 @@ public:
 
     virtual WebRange markedRange() const = 0;
 
+    virtual bool firstRectForCharacterRange(unsigned location, unsigned length, WebRect&) const = 0;
+
     // Supports commands like Undo, Redo, Cut, Copy, Paste, SelectAll,
     // Unselect, etc. See EditorCommand.cpp for the full list of supported
     // commands.
@@ -536,6 +541,12 @@ public:
     // Only for testing purpose: 
     // Returns true if selection.anchorNode has a marker on range from |from| with |length|.
     virtual bool selectionStartHasSpellingMarkerFor(int from, int length) const = 0;
+
+    // Pauses and samples an SVG animation.  Returns false if there's no svg
+    // animation to pause.  This is only for testing.
+    virtual bool pauseSVGAnimation(const WebString& animationId,
+                                   double time,
+                                   const WebString& elementId) = 0;
 protected:
     ~WebFrame() { }
 };