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

Unified Diff: ui/views/bubble/bubble_frame_view.cc

Issue 2877483003: Implements core logic for Pixel Canvas (Closed)
Patch Set: Resolving comments Created 3 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: ui/views/bubble/bubble_frame_view.cc
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 23546f4919aacfd8bac43a5af462c2be3fd53f80..22169839e53a2f50b7faed52f17384f4f2b7145c 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -14,7 +14,6 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/compositor/paint_context.h"
#include "ui/compositor/paint_recorder.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
@@ -31,6 +30,7 @@
#include "ui/views/controls/image_view.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/layout_provider.h"
+#include "ui/views/paint_info.h"
#include "ui/views/resources/grit/views_resources.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -404,10 +404,13 @@ void BubbleFrameView::OnPaint(gfx::Canvas* canvas) {
// Border comes after children.
}
-void BubbleFrameView::PaintChildren(const ui::PaintContext& context) {
- NonClientFrameView::PaintChildren(context);
+void BubbleFrameView::PaintChildren(const PaintInfo& paint_info) {
+ NonClientFrameView::PaintChildren(paint_info);
- ui::PaintRecorder recorder(context, size());
+ ui::PaintCache paint_cache;
+ ui::PaintRecorder recorder(paint_info.context(),
+ paint_info.paint_recording_size(),
+ paint_info.paint_recording_scale(), &paint_cache);
OnPaintBorder(recorder.canvas());
}

Powered by Google App Engine
This is Rietveld 408576698