Title: [87236] branches/safari-534-branch/Source/WebKit2
Revision
87236
Author
lforsch...@apple.com
Date
2011-05-24 17:18:53 -0700 (Tue, 24 May 2011)

Log Message

Merge r87119.

Modified Paths

Diff

Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87235 => 87236)


--- branches/safari-534-branch/Source/WebKit2/ChangeLog	2011-05-25 00:18:31 UTC (rev 87235)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog	2011-05-25 00:18:53 UTC (rev 87236)
@@ -1,5 +1,20 @@
 2011-05-24  Lucas Forschler  <lforsch...@apple.com>
 
+    Merged r87119.
+
+    2011-05-23  Anders Carlsson  <ander...@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Cap painting to 30fps on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=61337
+        <rdar://problem/9213388>
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::displayTimerFired):
+
+2011-05-24  Lucas Forschler  <lforsch...@apple.com>
+
     Merged r87102.
 
     2011-05-20  Jer Noble  <jer.no...@apple.com>

Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (87235 => 87236)


--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp	2011-05-25 00:18:31 UTC (rev 87235)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp	2011-05-25 00:18:53 UTC (rev 87236)
@@ -496,8 +496,13 @@
 
 void DrawingAreaImpl::displayTimerFired()
 {
+#if PLATFORM(WIN)
+    // For now we'll cap painting on Windows to 30fps because painting is much slower there for some reason.
+    static const double minimumFrameInterval = 1.0 / 30.0;
+#else
     static const double minimumFrameInterval = 1.0 / 60.0;
-    
+#endif
+
     double timeSinceLastDisplay = currentTime() - m_lastDisplayTime;
     double timeUntilLayerTreeHostNeedsDisplay = m_layerTreeHost && m_layerTreeHost->participatesInDisplay() ? m_layerTreeHost->timeUntilNextDisplay() : 0;
     double timeUntilNextDisplay = max(minimumFrameInterval - timeSinceLastDisplay, timeUntilLayerTreeHostNeedsDisplay);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to