Title: [124620] trunk/Source/WebKit2
- Revision
- 124620
- Author
- [email protected]
- Date
- 2012-08-03 09:08:09 -0700 (Fri, 03 Aug 2012)
Log Message
Unreviewed, rolling out r124603.
http://trac.webkit.org/changeset/124603
https://bugs.webkit.org/show_bug.cgi?id=93077
Made a few tests crash under
LayerTreeCoordinator::flushPendingLayerChanges
* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
(WebKit::LayerTreeCoordinator::LayerTreeCoordinator):
(WebKit::LayerTreeCoordinator::forceRepaint):
(WebKit::LayerTreeCoordinator::layerTreeTileUpdatesAllowed):
* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:
(LayerTreeCoordinator):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (124619 => 124620)
--- trunk/Source/WebKit2/ChangeLog 2012-08-03 16:07:57 UTC (rev 124619)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-03 16:08:09 UTC (rev 124620)
@@ -1,3 +1,19 @@
+2012-08-03 Balazs Kelemen <[email protected]>
+
+ Unreviewed, rolling out r124603.
+ http://trac.webkit.org/changeset/124603
+ https://bugs.webkit.org/show_bug.cgi?id=93077
+
+ Made a few tests crash under
+ LayerTreeCoordinator::flushPendingLayerChanges
+
+ * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
+ (WebKit::LayerTreeCoordinator::LayerTreeCoordinator):
+ (WebKit::LayerTreeCoordinator::forceRepaint):
+ (WebKit::LayerTreeCoordinator::layerTreeTileUpdatesAllowed):
+ * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:
+ (LayerTreeCoordinator):
+
2012-08-03 Mario Sanchez Prada <[email protected]>
Unreviewed build fix for GTK after r124479.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp (124619 => 124620)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp 2012-08-03 16:07:57 UTC (rev 124619)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp 2012-08-03 16:08:09 UTC (rev 124620)
@@ -44,7 +44,6 @@
#include <WebCore/RenderLayerCompositor.h>
#include <WebCore/RenderView.h>
#include <WebCore/Settings.h>
-#include <wtf/TemporaryChange.h>
using namespace WebCore;
@@ -78,7 +77,6 @@
, m_shouldSyncRootLayer(true)
, m_layerFlushTimer(this, &LayerTreeCoordinator::layerFlushTimerFired)
, m_layerFlushSchedulingEnabled(true)
- , m_inForceRepaint(false)
{
// Create a root layer.
m_rootLayer = GraphicsLayer::create(this);
@@ -176,8 +174,6 @@
void LayerTreeCoordinator::forceRepaint()
{
- WTF::TemporaryChange<bool> inForceRepaint(m_inForceRepaint, true);
-
// This is necessary for running layout tests. Since in this case we are not waiting for a UIProcess to reply nicely.
// Instead we are just triggering forceRepaint. But we still want to have the scripted animation callbacks being executed.
syncDisplayState();
@@ -579,7 +575,7 @@
bool LayerTreeCoordinator::layerTreeTileUpdatesAllowed() const
{
- return m_inForceRepaint || (!m_isSuspended && !m_waitingForUIProcess);
+ return !m_isSuspended && !m_waitingForUIProcess;
}
void LayerTreeCoordinator::purgeBackingStores()
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h (124619 => 124620)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h 2012-08-03 16:07:57 UTC (rev 124619)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h 2012-08-03 16:08:09 UTC (rev 124620)
@@ -137,7 +137,6 @@
void layerFlushTimerFired(WebCore::Timer<LayerTreeCoordinator>*);
WebCore::Timer<LayerTreeCoordinator> m_layerFlushTimer;
bool m_layerFlushSchedulingEnabled;
- bool m_inForceRepaint;
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
