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

Unified Diff: Source/core/paint/TransparencyDisplayItem.cpp

Issue 757183003: Revert of Enable fast/images with slimming paint (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/core/paint/TransparencyDisplayItem.h ('k') | Source/core/paint/ViewDisplayList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/TransparencyDisplayItem.cpp
diff --git a/Source/core/paint/TransparencyDisplayItem.cpp b/Source/core/paint/TransparencyDisplayItem.cpp
index 90dd628be3af5750359c3a68fdd9975dd668bea4..77605749f74b035fee3a09e5c0dd1def7c8bb693 100644
--- a/Source/core/paint/TransparencyDisplayItem.cpp
+++ b/Source/core/paint/TransparencyDisplayItem.cpp
@@ -5,15 +5,15 @@
#include "config.h"
#include "core/paint/TransparencyDisplayItem.h"
-#include "core/rendering/RenderObject.h"
-#include "core/rendering/RenderView.h"
-#include "platform/RuntimeEnabledFeatures.h"
#include "platform/graphics/GraphicsContext.h"
namespace blink {
void BeginTransparencyDisplayItem::replay(GraphicsContext* context)
{
+ context->save();
+ context->clip(m_clipRect);
+
bool hasBlendMode = this->hasBlendMode();
if (hasBlendMode)
context->setCompositeOperation(context->compositeOperation(), m_blendMode);
@@ -22,13 +22,17 @@
if (hasBlendMode)
context->setCompositeOperation(context->compositeOperation(), WebBlendModeNormal);
+#ifdef REVEAL_TRANSPARENCY_LAYERS
+ context->fillRect(clipRect, Color(0.0f, 0.0f, 0.5f, 0.2f));
+#endif
}
#ifndef NDEBUG
WTF::String BeginTransparencyDisplayItem::asDebugString() const
{
- return String::format("{%s, type: \"%s\", hasBlendMode: %d, blendMode: %d, opacity: %f}",
+ return String::format("{%s, type: \"%s\", clip bounds: [%f,%f,%f,%f], hasBlendMode: %d, blendMode: %d, opacity: %f}",
rendererDebugString(renderer()).utf8().data(), typeAsDebugString(type()).utf8().data(),
+ m_clipRect.x().toFloat(), m_clipRect.y().toFloat(), m_clipRect.width().toFloat(), m_clipRect.height().toFloat(),
hasBlendMode(), m_blendMode, m_opacity);
}
#endif
@@ -36,6 +40,7 @@
void EndTransparencyDisplayItem::replay(GraphicsContext* context)
{
context->endLayer();
+ context->restore();
}
#ifndef NDEBUG
@@ -46,25 +51,4 @@
}
#endif
-TransparencyRecorder::TransparencyRecorder(GraphicsContext* graphicsContext, const RenderObject* renderer, DisplayItem::Type type, const WebBlendMode& blendMode, const float opacity)
- : m_renderer(renderer)
- , m_type(type)
- , m_graphicsContext(graphicsContext)
-{
- OwnPtr<BeginTransparencyDisplayItem> beginTransparencyDisplayItem = adoptPtr(new BeginTransparencyDisplayItem(renderer, type, blendMode, opacity));
- if (RuntimeEnabledFeatures::slimmingPaintEnabled())
- renderer->view()->viewDisplayList().add(beginTransparencyDisplayItem.release());
- else
- beginTransparencyDisplayItem->replay(graphicsContext);
-}
-
-TransparencyRecorder::~TransparencyRecorder()
-{
- OwnPtr<EndTransparencyDisplayItem> endTransparencyDisplayItem = adoptPtr(new EndTransparencyDisplayItem(m_renderer, m_type));
- if (RuntimeEnabledFeatures::slimmingPaintEnabled())
- m_renderer->view()->viewDisplayList().add(endTransparencyDisplayItem.release());
- else
- endTransparencyDisplayItem->replay(m_graphicsContext);
-}
-
} // namespace blink
« no previous file with comments | « Source/core/paint/TransparencyDisplayItem.h ('k') | Source/core/paint/ViewDisplayList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698