Do null check when setting ScrollClipLayer

webkit/renderer/compositor_bindings/web_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event_impl.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
@@ skipping 240 matching lines @@
 
 blink::WebPoint WebLayerImpl::scrollPosition() const {
   return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
 }
 
 WebSize WebLayerImpl::maxScrollPosition() const {
   return layer_->MaxScrollOffset();
 }
 
 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());
 }
 
 bool WebLayerImpl::scrollable() const { return layer_->scrollable(); }
 
 void WebLayerImpl::setUserScrollable(bool horizontal, bool vertical) {
   layer_->SetUserScrollable(horizontal, vertical);
 }
 
 bool WebLayerImpl::userScrollableHorizontal() const {
@@ skipping 163 matching lines @@
 void WebLayerImpl::setClipParent(blink::WebLayer* parent) {
   cc::Layer* clip_parent = NULL;
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const { return layer_.get(); }
 
 }  // namespace webkit