update to accommodate latest clang in chrome toolchain

src/views/SkViewPriv.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkViewPriv.h"
 
 //////////////////////////////////////////////////////////////////////
 
 void SkView::Artist::draw(SkView* view, SkCanvas* canvas)
 {
     SkASSERT(view && canvas);
     this->onDraw(view, canvas);
 }
 
 void SkView::Artist::inflate(const SkDOM& dom, const SkDOM::Node* node)
 {
-    SkASSERT(&dom && node);
+    SkASSERT(node);
     this->onInflate(dom, node);
 }
 
 void SkView::Artist::onInflate(const SkDOM&, const SkDOM::Node*)
 {
     // subclass should override this as needed
 }
 
 SkView::Artist* SkView::getArtist() const
 {
@@ skipping 25 matching lines @@
 
 void SkView::Layout::layoutChildren(SkView* parent)
 {
     SkASSERT(parent);
     if (parent->width() > 0 && parent->height() > 0)
         this->onLayoutChildren(parent);
 }
 
 void SkView::Layout::inflate(const SkDOM& dom, const SkDOM::Node* node)
 {
-    SkASSERT(&dom && node);
+    SkASSERT(node);
     this->onInflate(dom, node);
 }
 
 void SkView::Layout::onInflate(const SkDOM&, const SkDOM::Node*)
 {
     // subclass should override this as needed
 }
 
 SkView::Layout* SkView::getLayout() const
 {
@@ skipping 17 matching lines @@
             SkRefCnt_SafeAssign(rec->fLayout, obj);
         else
             this->addTagList(new Layout_SkTagList(obj));
     }
 
     if (invokeLayoutNow)
         this->invokeLayout();
 
     return obj;
 }