Title: [143998] trunk/Source/WebKit/chromium
- Revision
- 143998
- Author
- jam...@google.com
- Date
- 2013-02-25 18:25:13 -0800 (Mon, 25 Feb 2013)
Log Message
[chromium] WebViewImpl::m_client can be null in some unit tests, check it before calling
https://bugs.webkit.org/show_bug.cgi?id=110834
Reviewed by Adrienne Walker.
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::suppressInvalidations):
(WebKit::WebViewImpl::setRootGraphicsLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (143997 => 143998)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-26 02:25:04 UTC (rev 143997)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-26 02:25:13 UTC (rev 143998)
@@ -1,3 +1,14 @@
+2013-02-25 James Robinson <jam...@chromium.org>
+
+ [chromium] WebViewImpl::m_client can be null in some unit tests, check it before calling
+ https://bugs.webkit.org/show_bug.cgi?id=110834
+
+ Reviewed by Adrienne Walker.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::suppressInvalidations):
+ (WebKit::WebViewImpl::setRootGraphicsLayer):
+
2013-02-25 Ken Kania <kka...@chromium.org>
Remove browser patching mechanism for handling _javascript_ dialogs in chromium port
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (143997 => 143998)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-02-26 02:25:04 UTC (rev 143997)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-02-26 02:25:13 UTC (rev 143998)
@@ -4002,7 +4002,8 @@
void WebViewImpl::suppressInvalidations(bool enable)
{
m_suppressInvalidations = enable;
- m_client->suppressCompositorScheduling(enable);
+ if (m_client)
+ m_client->suppressCompositorScheduling(enable);
}
#if USE(ACCELERATED_COMPOSITING)
@@ -4013,8 +4014,7 @@
void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
{
- m_client->suppressCompositorScheduling(true);
- TemporaryChange<bool> change(m_suppressInvalidations, true);
+ suppressInvalidations(true);
m_rootGraphicsLayer = layer;
m_rootLayer = layer ? layer->platformLayer() : 0;
@@ -4038,7 +4038,7 @@
m_layerTreeView->clearRootLayer();
}
- m_client->suppressCompositorScheduling(false);
+ suppressInvalidations(false);
}
void WebViewImpl::scheduleCompositingLayerSync()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
