Get WebKit r44544.

1 files changed, 7 insertions, 0 deletions

diff --git a/WebCore/rendering/RenderButton.cpp b/WebCore/rendering/RenderButton.cpp
index d64d7c3..b266f42 100644
--- a/WebCore/rendering/RenderButton.cpp
+++ b/WebCore/rendering/RenderButton.cpp
@@ -180,6 +180,13 @@ IntRect RenderButton::controlClipRect(int tx, int ty) const
 
 void RenderButton::timerFired(Timer<RenderButton>*)
 {
+    // FIXME Bug 25110: Ideally we would stop our timer when our Document
+    // enters the page cache. But we currently have no way of being notified
+    // when that happens, so we'll just ignore the timer firing as long as
+    // we're in the cache.
+    if (document()->inPageCache())
+        return;
+
     repaint();
 }