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

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp

Issue 2186643002: Fold compositing display items into contained drawings if the drawing is a singleton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: none Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp b/third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp
index 15fb79b3c8df7d58edebe9b394d98c8483bb7497..4a6fca1c61622266b94b83d86eba809af7315e17 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/CompositingRecorder.cpp
@@ -7,7 +7,9 @@
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/GraphicsLayer.h"
#include "platform/graphics/paint/CompositingDisplayItem.h"
+#include "platform/graphics/paint/DrawingRecorder.h"
#include "platform/graphics/paint/PaintController.h"
+#include "platform/graphics/paint/SkPictureBuilder.h"
namespace blink {
@@ -30,7 +32,43 @@ void CompositingRecorder::beginCompositing(GraphicsContext& graphicsContext, con
void CompositingRecorder::endCompositing(GraphicsContext& graphicsContext, const DisplayItemClient& client)
{
- graphicsContext.getPaintController().endItem<EndCompositingDisplayItem>(client);
+ // If the end of the current display list is of the form [BeginCompositingDisplayItem] [DrawingDisplayItem],
+ // then fold the BeginCompositingDisplayItem into a new DrawingDisplayItem that replaces them both. This allows
+ // Skia to optimize for the case when the BeginCompositingDisplayItem represents a simple opacity/color that can be merged into
+ // the opacity/color of the drawing. See crbug.com/628831 for more details.
+ PaintController& paintController = graphicsContext.getPaintController();
+ const DisplayItem* lastDisplayItem = paintController.lastDisplayItem(0);
+ const DisplayItem* secondToLastDisplayItem = paintController.lastDisplayItem(1);
+ if (lastDisplayItem && secondToLastDisplayItem && lastDisplayItem->drawsContent() && secondToLastDisplayItem->isBeginCompositingDisplayItem()) {
+ FloatRect cullRect(((DrawingDisplayItem*)lastDisplayItem)->picture()->cullRect());
+ const DisplayItemClient& displayItemClient = lastDisplayItem->client();
+ DisplayItem::Type displayItemType = lastDisplayItem->getType();
+
+ // Re-record the last two DisplayItems into a new SkPicture.
+ SkPictureBuilder pictureBuilder(cullRect, nullptr, &graphicsContext);
+ {
+ DrawingRecorder newRecorder(pictureBuilder.context(), displayItemClient, displayItemType, cullRect);
+ DCHECK(!DrawingRecorder::useCachedDrawingIfPossible(pictureBuilder.context(), displayItemClient, displayItemType));
+
+ secondToLastDisplayItem->replay(pictureBuilder.context());
+ lastDisplayItem->replay(pictureBuilder.context());
+ EndCompositingDisplayItem(client).replay(pictureBuilder.context());
+ }
+
+ paintController.removeLastDisplayItem(); // Remove the DrawingDisplayItem.
+ paintController.removeLastDisplayItem(); // Remove the BeginCompositingDisplayItem.
+
+ // The new item cannot be cached, because it is a mutation of the DisplayItem the client thought it was painting.
+ paintController.beginSkippingCache();
+ {
+ // Replay the new SKPicture into a new DrawingDisplayItem in the original DisplayItemList.
+ DrawingRecorder newRecorder(graphicsContext, displayItemClient, displayItemType, cullRect);
+ pictureBuilder.endRecording()->playback(graphicsContext.canvas());
+ }
+ paintController.endSkippingCache();
+ } else {
+ graphicsContext.getPaintController().endItem<EndCompositingDisplayItem>(client);
+ }
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698