Do null check when setting ScrollClipLayer

webkit/renderer/compositor_bindings/web_layer_impl.cc

Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
index 5f76315980eb98305a8c5429cce4edaba7c28a89..4eabb75470e371a518eef13bca74a8beca7cf01f 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -258,8 +258,11 @@ WebSize WebLayerImpl::maxScrollPosition() const {
 }
 
 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) {
-  cc::Layer* cc_clip_layer =
-      clip_layer ? static_cast<WebLayerImpl*>(clip_layer)->layer() : 0;
+  if (!clip_layer) {
+    layer_->SetScrollClipLayerId(Layer::INVALID_ID);
+    return;
+  }
+  cc::Layer* cc_clip_layer = static_cast<WebLayerImpl*>(clip_layer)->layer();

[enne (OOO), 2014/03/18 23:39:05]

Can you just ask for clip_layer->id() directly, no static cast?

[qinmin, 2014/03/18 23:57:40]

Done. 

On 2014/03/18 23:39:05, enne wrote:

   layer_->SetScrollClipLayerId(cc_clip_layer->id());
 }