Webkit merge 39050:39100 (CL 5 of 5).

Review URL: http://codereview.chromium.org/13740

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6810 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 25 deletions

diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index 90ca327..3127e4b 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -42,7 +42,6 @@
 #include "NotImplemented.h"
 #include "npruntime_priv.h"
 #include "np_v8object.h"
-#include "PausedTimeouts.h"
 #include "ScriptSourceCode.h"
 #include "Widget.h"
 
@@ -139,26 +138,6 @@ void ScriptController::unentangleMessagePort(MessagePort *port)
     }
 }
 
-void ScriptController::pauseTimeouts(OwnPtr<PausedTimeouts>& result)
-{
-    DOMWindow* window = m_frame->domWindow();
-    if (!window) {
-        result.clear();
-        return;
-    }
-    window->pauseTimeouts(result);
-}
-
-void ScriptController::resumeTimeouts(OwnPtr<PausedTimeouts>& timeouts)
-{
-    DOMWindow* window = m_frame->domWindow();
-    if (!window) {
-        timeouts.clear();
-        return;
-    }
-    window->resumeTimeouts(timeouts);
-}
-
 ScriptController::ScriptController(Frame* frame)
     : m_frame(frame)
     , m_sourceURL(0)
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index 00c6e0c..5269a6a 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -127,7 +127,6 @@ class Event;
 class Frame;
 class HTMLPlugInElement;
 class Node;
-class PausedTimeouts;
 class ScriptSourceCode;
 class String;
 class Widget;
@@ -248,9 +247,6 @@ public:
     void clearWindowShell();
     void updateDocument();
 
-    void pauseTimeouts(OwnPtr<PausedTimeouts>&);
-    void resumeTimeouts(OwnPtr<PausedTimeouts>&);
-
     void clearScriptObjects();
     void cleanupScriptObjectsForPlugin(void*);
 
diff --git a/webkit/port/platform/chromium/ChromiumBridge.h b/webkit/port/platform/chromium/ChromiumBridge.h
index 3513293..eaf0ccd 100644
--- a/webkit/port/platform/chromium/ChromiumBridge.h
+++ b/webkit/port/platform/chromium/ChromiumBridge.h
@@ -32,6 +32,7 @@
 
 #include "config.h"
 
+#include "LinkHash.h"
 #include "PasteboardPrivate.h"
 #include "PassRefPtr.h"
 #include "PlatformString.h"
@@ -147,6 +148,9 @@ namespace WebCore {
         // Widget -------------------------------------------------------------
         static void widgetSetCursor(Widget*, const Cursor&);
         static void widgetSetFocus(Widget*);
+
+        // Link history -------------------------------------------------------
+        static bool isLinkVisited(LinkHash);
     };
 }