Move paint-related timings out of DocumentTiming

third_party/WebKit/Source/core/timing/PerformanceTiming.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "core/timing/PerformanceTiming.h"
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentTiming.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
+#include "core/paint/PaintTiming.h"
 #include "core/timing/PerformanceBase.h"
 #include "platform/network/ResourceLoadTiming.h"
 #include "platform/network/ResourceResponse.h"
 
 namespace blink {
 
 static unsigned long long toIntegerMilliseconds(double seconds)
 {
     ASSERT(seconds >= 0);
     double clampedSeconds = PerformanceBase::clampTimeResolution(seconds);
@@ skipping 267 matching lines @@
 {
     const DocumentTiming* timing = documentTiming();
     if (!timing)
         return 0;
 
     return monotonicTimeToIntegerMilliseconds(timing->firstLayout());
 }
 
 unsigned long long PerformanceTiming::firstPaint() const
 {
-    const DocumentTiming* timing = documentTiming();
+    const PaintTiming* timing = paintTiming();
     if (!timing)
         return 0;
 
     return monotonicTimeToIntegerMilliseconds(timing->firstPaint());
 }
 
 unsigned long long PerformanceTiming::firstTextPaint() const
 {
-    const DocumentTiming* timing = documentTiming();
+    const PaintTiming* timing = paintTiming();
     if (!timing)
         return 0;
 
     return monotonicTimeToIntegerMilliseconds(timing->firstTextPaint());
 }
 
 unsigned long long PerformanceTiming::firstImagePaint() const
 {
-    const DocumentTiming* timing = documentTiming();
+    const PaintTiming* timing = paintTiming();
     if (!timing)
         return 0;
 
     return monotonicTimeToIntegerMilliseconds(timing->firstImagePaint());
 }
 
 DocumentLoader* PerformanceTiming::documentLoader() const
 {
     if (!m_frame)
         return nullptr;
 
     return m_frame->loader().documentLoader();
 }
 
 const DocumentTiming* PerformanceTiming::documentTiming() const
 {
     if (!m_frame)
         return nullptr;
 
     Document* document = m_frame->document();
     if (!document)
         return nullptr;
 
     return &document->timing();
 }
 
+const PaintTiming* PerformanceTiming::paintTiming() const
+{
+    if (!m_frame)
+        return nullptr;
+
+    Document* document = m_frame->document();
+    if (!document)
+        return nullptr;
+
+    return &PaintTiming::from(*document);
+}
+
 DocumentLoadTiming* PerformanceTiming::documentLoadTiming() const
 {
     DocumentLoader* loader = documentLoader();
     if (!loader)
         return nullptr;
 
     return &loader->timing();
 }
 
 ResourceLoadTiming* PerformanceTiming::resourceLoadTiming() const
@@ skipping 50 matching lines @@
 
     return timing->pseudoWallTimeToMonotonicTime(toDoubleSeconds(integerMilliseconds));
 }
 
 DEFINE_TRACE(PerformanceTiming)
 {
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink