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..cd7283c5e53bfba84c6c68a19163ca5911eaa589 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
@@ -258,6 +258,10 @@ WebSize WebLayerImpl::maxScrollPosition() const {
 }
 
 void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) {
+  if (!clip_layer) {
+    layer_->SetScrollClipLayerId(Layer::INVALID_ID);
+    return;
+  }
   cc::Layer* cc_clip_layer =
       clip_layer ? static_cast<WebLayerImpl*>(clip_layer)->layer() : 0;

[aelias_OOO_until_Jul13, 2014/03/18 23:17:10]

Please also get rid of the null check here.

[qinmin, 2014/03/18 23:20:43]

missed it, done
On 2014/03/18 23:17:10, aelias wrote:

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