update to accommodate latest clang in chrome toolchain

src/views/SkTextBox.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTextBox.h"
 #include "SkUtils.h"
 
@@ skipping 149 matching lines @@
 void SkTextBox::setSpacing(SkScalar mul, SkScalar add)
 {
     fSpacingMul = mul;
     fSpacingAdd = add;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPaint& paint)
 {
-    SkASSERT(canvas && &paint && (text || len == 0));
+    SkASSERT(canvas && (text || len == 0));
 
     SkScalar marginWidth = fBox.width();
 
     if (marginWidth <= 0 || len == 0)
         return;
 
     const char* textStop = text + len;
 
     SkScalar                x, y, scaledSpacing, height, fontHeight;
     SkPaint::FontMetrics    metrics;
@@ skipping 69 matching lines @@
 }
 
 int SkTextBox::countLines() const {
     return SkTextLineBreaker::CountLines(fText, fLen, *fPaint, fBox.width());
 }
 
 SkScalar SkTextBox::getTextHeight() const {
     SkScalar spacing = SkScalarMul(fPaint->getTextSize(), fSpacingMul) + fSpacingAdd;
     return this->countLines() * spacing;
 }