Clean up cc/paint interfaces

third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp

 // Copyright 2014 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 "platform/graphics/paint/PaintController.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 748 matching lines @@
 #ifndef NDEBUG
   LOG(ERROR) << "New display item: " << newItem.asDebugString();
   LOG(ERROR) << "Old display item: "
              << (oldItem ? oldItem->asDebugString() : "None");
 #else
   LOG(ERROR) << "Run debug build to get more details.";
 #endif
   LOG(ERROR) << "See http://crbug.com/619103.";
 
 #ifndef NDEBUG
-  const PaintRecord* newRecord =
-      newItem.isDrawing()
-          ? static_cast<const DrawingDisplayItem&>(newItem).GetPaintRecord()
-          : nullptr;
-  const PaintRecord* oldRecord =
-      oldItem && oldItem->isDrawing()
-          ? static_cast<const DrawingDisplayItem*>(oldItem)->GetPaintRecord()
-          : nullptr;
+  const PaintRecord* newRecord = nullptr;
+  if (newItem.isDrawing()) {
+    newRecord =
+        static_cast<const DrawingDisplayItem&>(newItem).GetPaintRecord().get();
+  }
+  const PaintRecord* oldRecord = nullptr;
+  if (oldItem->isDrawing()) {
+    oldRecord =
+        static_cast<const DrawingDisplayItem*>(oldItem)->GetPaintRecord().get();
+  }
   LOG(INFO) << "new record:\n"
             << (newRecord ? recordAsDebugString(newRecord) : "None");
   LOG(INFO) << "old record:\n"
             << (oldRecord ? recordAsDebugString(oldRecord) : "None");
 
   showDebugData();
 #endif  // NDEBUG
 }
 
 void PaintController::checkUnderInvalidation() {
@@ skipping 74 matching lines @@
                        showPaintRecords
                            ? (DisplayItemList::JsonOptions::ShowPaintRecords |
                               DisplayItemList::JsonOptions::ShowClientDebugName)
                            : DisplayItemList::JsonOptions::ShowClientDebugName)
                    ->toPrettyJSONString()
                    .utf8()
                    .data());
 }
 
 }  // namespace blink