Avoid calling currentTime() from FrameView::adjustedDeferredRepaintDelay()...

Avoid calling currentTime() from FrameView::adjustedDeferredRepaintDelay() when repaints are deferred
https://bugs.webkit.org/show_bug.cgi?id=57914

Reviewed by Cameron Zwarich.

Don't call adjustedDeferredRepaintDelay unnecessarily.

* page/FrameView.cpp:
(WebCore::FrameView::repaintContentRectangle):
(WebCore::FrameView::adjustedDeferredRepaintDelay):



git-svn-id: svn://svn.chromium.org/blink/trunk@83022 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-04-05  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Avoid calling currentTime() from FrameView::adjustedDeferredRepaintDelay() when repaints are deferred
+        https://bugs.webkit.org/show_bug.cgi?id=57914
+
+        Don't call adjustedDeferredRepaintDelay unnecessarily.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::repaintContentRectangle):
+        (WebCore::FrameView::adjustedDeferredRepaintDelay):
+
 2011-04-05  Steve VanDeBogart  <vandebo@chromium.org>
 
         Reviewed by David Levin.

third_party/WebKit/Source/WebCore/page/FrameView.cpp

@@ -1435,7 +1435,7 @@ void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
 {
     ASSERT(!m_frame->ownerElement());
 
-    double delay = adjustedDeferredRepaintDelay();
+    double delay = m_deferringRepaints ? 0 : adjustedDeferredRepaintDelay();
     if ((m_deferringRepaints || m_deferredRepaintTimer.isActive() || delay) && !immediate) {
         IntRect paintRect = r;
         if (clipsRepaints() && !paintsEntireContents())
@@ -1587,6 +1587,7 @@ void FrameView::resetDeferredRepaintDelay()
 
 double FrameView::adjustedDeferredRepaintDelay() const
 {
+    ASSERT(!m_deferringRepaints);
     if (!m_deferredRepaintDelay)
         return 0;
     double timeSinceLastPaint = currentTime() - m_lastPaintTime;