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

Unified Diff: services/ui/ws/frame_generator.cc

Issue 2127383003: mus: Introduce high-contrast mode in mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index d09b0d7288ec6a725dd308c46025b4c29fbbc4a7..d48aa386c6d1071f18e72cb1d6ffc82bc234c83b 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -7,6 +7,7 @@
#include "base/containers/adapters.h"
#include "cc/output/compositor_frame.h"
#include "cc/quads/render_pass.h"
+#include "cc/quads/render_pass_draw_quad.h"
#include "cc/quads/shared_quad_state.h"
#include "cc/quads/surface_draw_quad.h"
#include "services/ui/surfaces/display_compositor.h"
@@ -26,7 +27,9 @@ FrameGenerator::FrameGenerator(FrameGeneratorDelegate* delegate,
gpu_state_(gpu_state),
surfaces_state_(surfaces_state),
draw_timer_(false, false),
- weak_factory_(this) {}
+ weak_factory_(this) {
+ DCHECK(delegate_);
+}
FrameGenerator::~FrameGenerator() {
// Invalidate WeakPtrs now to avoid callbacks back into the
@@ -90,8 +93,11 @@ void FrameGenerator::DidDraw(cc::SurfaceDrawStatus status) {
cc::CompositorFrame FrameGenerator::GenerateCompositorFrame() {
msw 2016/07/12 18:30:09 I presume danakj looked here; I don't understand t
sadrul 2016/07/13 01:01:22 Yep. That's all we do (except we set the filter on
const ViewportMetrics& metrics = delegate_->GetViewportMetrics();
std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
- render_pass->damage_rect = dirty_rect_;
- render_pass->output_rect = gfx::Rect(metrics.size_in_pixels);
+ gfx::Rect output_rect(metrics.size_in_pixels);
+ dirty_rect_.Intersect(output_rect);
+ const cc::RenderPassId render_pass_id(1, 1);
+ render_pass->SetNew(render_pass_id, output_rect, dirty_rect_,
+ gfx::Transform());
DrawWindowTree(render_pass.get(), delegate_->GetRootWindow(), gfx::Vector2d(),
1.0f);
@@ -99,6 +105,24 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame() {
std::unique_ptr<cc::DelegatedFrameData> frame_data(
new cc::DelegatedFrameData);
frame_data->render_pass_list.push_back(std::move(render_pass));
+ if (delegate_->IsInHighContrastMode()) {
+ std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
+ invert_pass->SetNew(cc::RenderPassId(2, 0), output_rect, dirty_rect_,
+ gfx::Transform());
+ cc::SharedQuadState* shared_state =
+ invert_pass->CreateAndAppendSharedQuadState();
+ shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
+ output_rect, false, 1.f, SkXfermode::kSrcOver_Mode, 0);
+ auto* quad = invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
+ cc::FilterOperations filters;
+ filters.Append(cc::FilterOperation::CreateInvertFilter(1.0));
msw 2016/07/12 18:30:09 nit: 1.f?
sadrul 2016/07/13 01:01:22 Done.
+ quad->SetNew(shared_state, output_rect, output_rect, render_pass_id,
+ 0 /* mask_resource_id */, gfx::Vector2dF() /* mask_uv_scale */,
+ gfx::Size() /* mask_texture_size */, filters,
+ gfx::Vector2dF() /* filters_scale */,
+ cc::FilterOperations() /* background_filters */);
+ frame_data->render_pass_list.push_back(std::move(invert_pass));
+ }
cc::CompositorFrame frame;
frame.delegated_frame_data = std::move(frame_data);

Powered by Google App Engine
This is Rietveld 408576698