Diff
Modified: trunk/Source/WebCore/ChangeLog (100494 => 100495)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 21:07:20 UTC (rev 100495)
@@ -1,3 +1,19 @@
+2011-11-16 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r100438.
+ http://trac.webkit.org/changeset/100438
+ https://bugs.webkit.org/show_bug.cgi?id=72536
+
+ Broke unit tests (Requested by jamesr_ on #webkit).
+
+ * platform/PlatformScreen.h:
+ * platform/chromium/PlatformScreenChromium.cpp:
+ * platform/chromium/PlatformSupport.h:
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+ (WebCore::CCSettings::CCSettings):
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ (WebCore::CCThreadProxy::initializeImplOnImplThread):
+
2011-11-16 Andy Estes <aes...@apple.com>
Assertion failure in LayerFlushScheduler::resume() when running some layout tests in WebKitTestRunner
Modified: trunk/Source/WebCore/platform/PlatformScreen.h (100494 => 100495)
--- trunk/Source/WebCore/platform/PlatformScreen.h 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2011-11-16 21:07:20 UTC (rev 100495)
@@ -54,11 +54,6 @@
FloatRect screenRect(Widget*);
FloatRect screenAvailableRect(Widget*);
-#if PLATFORM(CHROMIUM)
- // Measured in frames per second. 0 if the refresh rate is unknown, or not applicable.
- double screenRefreshRate(Widget*);
-#endif
-
#if PLATFORM(MAC)
NSScreen *screenForWindow(NSWindow *);
Modified: trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp (100494 => 100495)
--- trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp 2011-11-16 21:07:20 UTC (rev 100495)
@@ -61,9 +61,4 @@
return PlatformSupport::screenAvailableRect(widget);
}
-double screenRefreshRate(Widget* widget)
-{
- return PlatformSupport::screenRefreshRate(widget);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (100494 => 100495)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-16 21:07:20 UTC (rev 100495)
@@ -234,7 +234,6 @@
static bool screenIsMonochrome(Widget*);
static IntRect screenRect(Widget*);
static IntRect screenAvailableRect(Widget*);
- static double screenRefreshRate(Widget*);
// SharedTimers -------------------------------------------------------
static void setSharedTimerFiredFunction(void (*func)());
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (100494 => 100495)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-11-16 21:07:20 UTC (rev 100495)
@@ -73,15 +73,13 @@
, compositeOffscreen(false)
, enableCompositorThread(false)
, showFPSCounter(false)
- , showPlatformLayerTree(false)
- , refreshRate(0) { }
+ , showPlatformLayerTree(false) { }
bool acceleratePainting;
bool compositeOffscreen;
bool enableCompositorThread;
bool showFPSCounter;
bool showPlatformLayerTree;
- double refreshRate;
};
// Provides information on an Impl's rendering capabilities back to the CCLayerTreeHost
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (100494 => 100495)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2011-11-16 21:07:20 UTC (rev 100495)
@@ -502,8 +502,7 @@
TRACE_EVENT("CCThreadProxy::initializeImplOnImplThread", this, 0);
ASSERT(isImplThread());
m_layerTreeHostImpl = m_layerTreeHost->createLayerTreeHostImpl(this);
- ASSERT(m_layerTreeHostImpl->settings().refreshRate > 0);
- const double displayRefreshIntervalMs = 1000.0 / m_layerTreeHostImpl->settings().refreshRate;
+ const double displayRefreshIntervalMs = 1000.0 / 60.0;
OwnPtr<CCFrameRateController> frameRateController = adoptPtr(new CCFrameRateController(CCDelayBasedTimeSource::create(displayRefreshIntervalMs, CCProxy::implThread())));
m_schedulerOnImplThread = CCScheduler::create(this, frameRateController.release());
m_schedulerOnImplThread->setVisible(m_layerTreeHostImpl->visible());
Modified: trunk/Source/WebKit/chromium/ChangeLog (100494 => 100495)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-16 21:07:20 UTC (rev 100495)
@@ -1,3 +1,17 @@
+2011-11-16 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r100438.
+ http://trac.webkit.org/changeset/100438
+ https://bugs.webkit.org/show_bug.cgi?id=72536
+
+ Broke unit tests (Requested by jamesr_ on #webkit).
+
+ * public/WebScreenInfo.h:
+ (WebKit::WebScreenInfo::WebScreenInfo):
+ * src/PlatformSupport.cpp:
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
2011-11-16 Alexandre Elias <ael...@google.com>
[chromium] Add minimum/maximumPageScaleFactor API and clamp fixes
Modified: trunk/Source/WebKit/chromium/public/WebScreenInfo.h (100494 => 100495)
--- trunk/Source/WebKit/chromium/public/WebScreenInfo.h 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebKit/chromium/public/WebScreenInfo.h 2011-11-16 21:07:20 UTC (rev 100495)
@@ -63,14 +63,10 @@
// some of the rectangle's coordinates may be negative values".
WebRect availableRect;
- // Measured in frames per second. 0 if the rate is unknown or not applicable.
- double refreshRate;
-
WebScreenInfo()
: depth(0)
, depthPerComponent(0)
- , isMonochrome(false)
- , refreshRate(0) { }
+ , isMonochrome(false) { }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (100494 => 100495)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-16 21:07:20 UTC (rev 100495)
@@ -1056,14 +1056,6 @@
return client->screenInfo().availableRect;
}
-double PlatformSupport::screenRefreshRate(Widget* widget)
-{
- WebWidgetClient* client = toWebWidgetClient(widget);
- if (!client)
- return 0;
- return client->screenInfo().refreshRate;
-}
-
bool PlatformSupport::popupsAllowed(NPP npp)
{
// FIXME: Give the embedder a way to control this.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (100494 => 100495)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-11-16 21:03:48 UTC (rev 100494)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-11-16 21:07:20 UTC (rev 100495)
@@ -86,7 +86,6 @@
#include "PlatformContextSkia.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
-#include "PlatformScreen.h"
#include "PlatformThemeChromiumLinux.h"
#include "PlatformWheelEvent.h"
#include "PopupContainer.h"
@@ -2744,18 +2743,12 @@
} else {
TRACE_EVENT("WebViewImpl::setIsAcceleratedCompositingActive(true)", this, 0);
- static const double defaultRefreshRate = 60.0;
-
WebCore::CCSettings ccSettings;
ccSettings.acceleratePainting = page()->settings()->acceleratedDrawingEnabled();
ccSettings.compositeOffscreen = settings()->compositeToTextureEnabled();
ccSettings.enableCompositorThread = settings()->useThreadedCompositor();
ccSettings.showFPSCounter = settings()->showFPSCounter();
ccSettings.showPlatformLayerTree = settings()->showPlatformLayerTree();
- ccSettings.refreshRate = screenRefreshRate(page()->mainFrame()->view());
- ASSERT(ccSettings.refreshRate >= 0);
- if (!ccSettings.refreshRate)
- ccSettings.refreshRate = defaultRefreshRate;
m_nonCompositedContentHost = NonCompositedContentHost::create(WebViewImplContentPainter::create(this));
m_layerTreeHost = CCLayerTreeHost::create(this, ccSettings);
