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

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

Issue 2660393002: Use gfx::ColorSpace instead of SkColorSpace in Blink (Closed)
Patch Set: Rebase (again) Created 3 years, 10 months 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // scenarios, it is an error to call GraphicsLayer::paint. Actual painting 83 // scenarios, it is an error to call GraphicsLayer::paint. Actual painting
84 // occurs in FrameView::paintTree(); this method merely copies the painted 84 // occurs in FrameView::paintTree(); this method merely copies the painted
85 // output to the WebDisplayItemList. 85 // output to the WebDisplayItemList.
86 if (paintingControl != PaintDefaultBehavior) 86 if (paintingControl != PaintDefaultBehavior)
87 m_graphicsLayer->paint(nullptr, disabledMode); 87 m_graphicsLayer->paint(nullptr, disabledMode);
88 88
89 paintController.paintArtifact().appendToWebDisplayItemList( 89 paintController.paintArtifact().appendToWebDisplayItemList(
90 webDisplayItemList); 90 webDisplayItemList);
91 91
92 if (m_graphicsLayer->colorBehavior().isTransformToTargetColorSpace()) { 92 if (m_graphicsLayer->colorBehavior().isTransformToTargetColorSpace()) {
93 webDisplayItemList->setImpliedColorSpace(gfx::ColorSpace::FromSkColorSpace( 93 webDisplayItemList->setImpliedColorSpace(
94 m_graphicsLayer->colorBehavior().targetColorSpace())); 94 m_graphicsLayer->colorBehavior().targetColorSpace());
95 } 95 }
96 paintController.setDisplayItemConstructionIsDisabled(false); 96 paintController.setDisplayItemConstructionIsDisabled(false);
97 paintController.setSubsequenceCachingIsDisabled(false); 97 paintController.setSubsequenceCachingIsDisabled(false);
98 } 98 }
99 99
100 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { 100 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const {
101 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); 101 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage();
102 } 102 }
103 103
104 } // namespace blink 104 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698