Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/paint/SkPictureBuilder.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/graphics/paint/SkPictureBuilder.h" 5 #include "platform/graphics/paint/SkPictureBuilder.h"
6 6
7 #include "platform/geometry/FloatRect.h" 7 #include "platform/geometry/FloatRect.h"
8 #include "platform/graphics/GraphicsContext.h" 8 #include "platform/graphics/GraphicsContext.h"
9 #include "platform/graphics/paint/PaintController.h" 9 #include "platform/graphics/paint/PaintController.h"
10 #include "wtf/PtrUtil.h" 10 #include "wtf/PtrUtil.h"
(...skipping 12 matching lines...) Expand all
23 if (paintController) { 23 if (paintController) {
24 m_paintController = paintController; 24 m_paintController = paintController;
25 } else { 25 } else {
26 m_paintControllerPtr = PaintController::create(); 26 m_paintControllerPtr = PaintController::create();
27 m_paintController = m_paintControllerPtr.get(); 27 m_paintController = m_paintControllerPtr.get();
28 } 28 }
29 #if DCHECK_IS_ON() 29 #if DCHECK_IS_ON()
30 m_paintController->setUsage(PaintController::ForSkPictureBuilder); 30 m_paintController->setUsage(PaintController::ForSkPictureBuilder);
31 #endif 31 #endif
32 32
33 m_context = wrapUnique( 33 m_context = WTF::wrapUnique(
34 new GraphicsContext(*m_paintController, disabledMode, metaData)); 34 new GraphicsContext(*m_paintController, disabledMode, metaData));
35 35
36 if (containingContext) { 36 if (containingContext) {
37 m_context->setDeviceScaleFactor(containingContext->deviceScaleFactor()); 37 m_context->setDeviceScaleFactor(containingContext->deviceScaleFactor());
38 m_context->setPrinting(containingContext->printing()); 38 m_context->setPrinting(containingContext->printing());
39 } 39 }
40 } 40 }
41 41
42 SkPictureBuilder::~SkPictureBuilder() { 42 SkPictureBuilder::~SkPictureBuilder() {
43 #if DCHECK_IS_ON() 43 #if DCHECK_IS_ON()
44 m_paintController->setUsage(PaintController::ForNormalUsage); 44 m_paintController->setUsage(PaintController::ForNormalUsage);
45 #endif 45 #endif
46 } 46 }
47 47
48 sk_sp<SkPicture> SkPictureBuilder::endRecording() { 48 sk_sp<SkPicture> SkPictureBuilder::endRecording() {
49 m_context->beginRecording(m_bounds); 49 m_context->beginRecording(m_bounds);
50 m_paintController->commitNewDisplayItems(); 50 m_paintController->commitNewDisplayItems();
51 m_paintController->paintArtifact().replay(*m_context); 51 m_paintController->paintArtifact().replay(*m_context);
52 return m_context->endRecording(); 52 return m_context->endRecording();
53 } 53 }
54 54
55 } // namespace blink 55 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698