summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm5
-rw-r--r--chrome/browser/ui/gtk/avatar_menu_item_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/gtk_theme_service.cc5
-rw-r--r--chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc4
-rw-r--r--chrome/browser/ui/libgtk2ui/gtk2_ui.cc5
-rw-r--r--chrome/browser/ui/panels/panel_browser_frame_view.cc4
-rw-r--r--chrome/browser/ui/panels/panel_browser_window_gtk.cc4
-rw-r--r--chrome/browser/ui/panels/panel_frame_view.cc4
-rw-r--r--chrome/browser/ui/panels/taskbar_window_thumbnailer_win.cc4
-rw-r--r--chrome/browser/ui/views/dropdown_bar_view.cc6
-rw-r--r--chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc2
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_win.cc2
-rw-r--r--chrome/browser/ui/views/tabs/dragged_tab_view.cc5
-rw-r--r--chrome/browser/ui/views/tabs/tab.cc8
-rw-r--r--chrome/browser/ui/views/tabs/tab_strip.cc4
-rw-r--r--chrome/browser/ui/views/theme_helpers.cc2
-rw-r--r--chrome/browser/ui/webui/ntp/ntp_login_handler.cc5
17 files changed, 39 insertions, 32 deletions
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index e0b77ed..fb52ade 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -105,7 +105,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
scoped_ptr<gfx::Canvas> canvas(
new gfx::Canvas(
gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),
- image_size), false));
+ image_size), ui::SCALE_FACTOR_100P, false));
canvas->DrawImageInt(*icon,
0, 0, icon->width(), icon->height(),
0, 0, image_size, image_size,
@@ -113,7 +113,8 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
canvas->DrawImageInt(*drop_image,
image_size + kDropArrowLeftMarginPx,
image_size / 2);
- [owner_ setButtonImage:gfx::SkBitmapToNSImage(canvas->ExtractBitmap())];
+ [owner_ setButtonImage:gfx::SkBitmapToNSImage(
+ canvas->ExtractImageRep().sk_bitmap())];
}
// Overridden from ExtensionInfoBarDelegate::DelegateObserver:
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
index 1510f6c..434fe22 100644
--- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
+++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
@@ -213,7 +213,7 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
int x = avatar_image->width() - check_image->width() + kCheckMarkXOffset;
canvas.DrawImageInt(*check_image, x, y);
- SkBitmap final_image = canvas.ExtractBitmap();
+ SkBitmap final_image = canvas.ExtractImageRep().sk_bitmap();
avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image);
} else {
avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(*item_.icon.ToSkBitmap());
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc
index 8d55010..27af31c 100644
--- a/chrome/browser/ui/gtk/gtk_theme_service.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc
@@ -1014,7 +1014,8 @@ SkBitmap GtkThemeService::GenerateFrameImage(
DCHECK(it != colors_.end());
SkColor base = it->second;
- gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight), true);
+ gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight),
+ ui::SCALE_FACTOR_100P, true);
int gradient_size;
GdkColor* gradient_top_color = NULL;
@@ -1041,7 +1042,7 @@ SkBitmap GtkThemeService::GenerateFrameImage(
canvas.FillRect(gfx::Rect(0, gradient_size, kToolbarImageWidth,
kToolbarImageHeight - gradient_size), base);
- return canvas.ExtractBitmap();
+ return canvas.ExtractImageRep().sk_bitmap();
}
SkBitmap GtkThemeService::GenerateTabImage(int base_id) const {
diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
index 4e5ff10..4ad5c21 100644
--- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
@@ -85,13 +85,13 @@ void ExtensionInfoBarGtk::OnImageLoaded(const gfx::Image& image,
static const int kDropArrowLeftMargin = 3;
scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
- image_size), false));
+ image_size), ui::SCALE_FACTOR_100P, false));
canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
image_size, image_size, false);
canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin,
image_size / 2);
- SkBitmap bitmap = canvas->ExtractBitmap();
+ SkBitmap bitmap = canvas->ExtractImageRep().sk_bitmap();
GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), pixbuf);
g_object_unref(pixbuf);
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index e2fede6..15cad58 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -740,7 +740,8 @@ SkBitmap Gtk2UI::GenerateFrameImage(
DCHECK(it != colors_.end());
SkColor base = it->second;
- gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight), true);
+ gfx::Canvas canvas(gfx::Size(kToolbarImageWidth, kToolbarImageHeight),
+ ui::SCALE_FACTOR_100P, true);
int gradient_size;
GdkColor* gradient_top_color = NULL;
@@ -767,7 +768,7 @@ SkBitmap Gtk2UI::GenerateFrameImage(
canvas.FillRect(gfx::Rect(0, gradient_size, kToolbarImageWidth,
kToolbarImageHeight - gradient_size), base);
- return canvas.ExtractBitmap();
+ return canvas.ExtractImageRep().sk_bitmap();
}
SkBitmap Gtk2UI::GenerateTabImage(int base_id) const {
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc
index 66bb7c1..d2006d8 100644
--- a/chrome/browser/ui/panels/panel_browser_frame_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc
@@ -150,9 +150,9 @@ struct EdgeResources {
};
gfx::ImageSkia* CreateImageForColor(SkColor color) {
- gfx::Canvas canvas(gfx::Size(1, 1), true);
+ gfx::Canvas canvas(gfx::Size(1, 1), ui::SCALE_FACTOR_100P, true);
canvas.DrawColor(color);
- return new gfx::ImageSkia(canvas.ExtractBitmap());
+ return new gfx::ImageSkia(canvas.ExtractImageRep());
}
const ButtonResources& GetCloseButtonResources() {
diff --git a/chrome/browser/ui/panels/panel_browser_window_gtk.cc b/chrome/browser/ui/panels/panel_browser_window_gtk.cc
index 1b15f44..d41a773 100644
--- a/chrome/browser/ui/panels/panel_browser_window_gtk.cc
+++ b/chrome/browser/ui/panels/panel_browser_window_gtk.cc
@@ -48,9 +48,9 @@ const SkColor kDividerColor = SkColorSetRGB(0x2a, 0x2c, 0x2c);
const int kMinWindowWidth = 26;
gfx::Image* CreateImageForColor(SkColor color) {
- gfx::Canvas canvas(gfx::Size(1, 1), true);
+ gfx::Canvas canvas(gfx::Size(1, 1), ui::SCALE_FACTOR_100P, true);
canvas.DrawColor(color);
- return new gfx::Image(canvas.ExtractBitmap());
+ return new gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep()));
}
const gfx::Image* GetActiveBackgroundDefaultImage() {
diff --git a/chrome/browser/ui/panels/panel_frame_view.cc b/chrome/browser/ui/panels/panel_frame_view.cc
index 2cd301f..5eee67d 100644
--- a/chrome/browser/ui/panels/panel_frame_view.cc
+++ b/chrome/browser/ui/panels/panel_frame_view.cc
@@ -109,9 +109,9 @@ struct EdgeResources {
};
gfx::ImageSkia* CreateImageForColor(SkColor color) {
- gfx::Canvas canvas(gfx::Size(1, 1), true);
+ gfx::Canvas canvas(gfx::Size(1, 1), ui::SCALE_FACTOR_100P, true);
canvas.DrawColor(color);
- return new gfx::ImageSkia(canvas.ExtractBitmap());
+ return new gfx::ImageSkia(canvas.ExtractImageRep());
}
const EdgeResources& GetFrameEdges() {
diff --git a/chrome/browser/ui/panels/taskbar_window_thumbnailer_win.cc b/chrome/browser/ui/panels/taskbar_window_thumbnailer_win.cc
index 5eee233..4dfdcdb 100644
--- a/chrome/browser/ui/panels/taskbar_window_thumbnailer_win.cc
+++ b/chrome/browser/ui/panels/taskbar_window_thumbnailer_win.cc
@@ -128,11 +128,11 @@ SkBitmap* TaskbarWindowThumbnailerWin::CaptureWindowImage() const {
int width = bounds.right - bounds.left;
int height = bounds.bottom - bounds.top;
- gfx::Canvas canvas(gfx::Size(width, height), false);
+ gfx::Canvas canvas(gfx::Size(width, height), ui::SCALE_FACTOR_100P, false);
HDC target_dc = canvas.BeginPlatformPaint();
HDC source_dc = ::GetDC(hwnd_);
::BitBlt(target_dc, 0, 0, width, height, source_dc, 0, 0, SRCCOPY);
::ReleaseDC(hwnd_, source_dc);
canvas.EndPlatformPaint();
- return new SkBitmap(canvas.ExtractBitmap());
+ return new SkBitmap(canvas.ExtractImageRep().sk_bitmap());
}
diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc
index b811c21..0067779 100644
--- a/chrome/browser/ui/views/dropdown_bar_view.cc
+++ b/chrome/browser/ui/views/dropdown_bar_view.cc
@@ -111,11 +111,13 @@ void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
if (animation_offset() > 0) {
gfx::Canvas animating_edges(
- gfx::Size(bounds().width(), kAnimatingEdgeHeight), false);
+ gfx::Size(bounds().width(), kAnimatingEdgeHeight),
+ canvas->scale_factor(),
+ false);
canvas->Translate(bounds().origin());
OnPaintBackground(&animating_edges);
OnPaintBorder(&animating_edges);
- canvas->DrawImageInt(animating_edges.ExtractBitmap(), bounds().x(),
+ canvas->DrawImageInt(animating_edges.ExtractImageRep(), bounds().x(),
animation_offset());
}
}
diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
index e26037b..2fba05a 100644
--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
+++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
@@ -44,7 +44,7 @@ BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
menu_->AppendMenuItemWithIcon(
command_id,
UTF8ToUTF16(view->button()->extension()->name()),
- canvas->ExtractBitmap());
+ canvas->ExtractImageRep());
// Set the tooltip for this item.
string16 tooltip = UTF8ToUTF16(
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index eb131b2..44a6e1a 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -2380,7 +2380,7 @@ void OmniboxViewWin::DrawSlashForInsecureScheme(HDC hdc,
// it to fully transparent so any antialiasing will look nice when painted
// atop the edit.
gfx::Canvas canvas(gfx::Size(scheme_rect.Width(), scheme_rect.Height()),
- false);
+ ui::SCALE_FACTOR_100P, false);
SkCanvas* sk_canvas = canvas.sk_canvas();
sk_canvas->getDevice()->accessBitmap(true).eraseARGB(0, 0, 0, 0);
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc
index 49e1431..cb0ff4d 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc
@@ -133,7 +133,8 @@ gfx::Size DraggedTabView::GetPreferredSize() {
void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
gfx::Size ps = GetPreferredSize();
- gfx::Canvas scale_canvas(ps, false);
+ // TODO(pkotwicz): DIP enable this class.
+ gfx::Canvas scale_canvas(ps, ui::SCALE_FACTOR_100P, false);
SkBitmap& bitmap_device = const_cast<SkBitmap&>(
skia::GetTopDevice(*scale_canvas.sk_canvas())->accessBitmap(true));
bitmap_device.eraseARGB(0, 0, 0, 0);
@@ -153,7 +154,7 @@ void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
SkIRect subset;
subset.set(0, 0, ps.width(), ps.height());
- SkBitmap mipmap = scale_canvas.ExtractBitmap();
+ SkBitmap mipmap = scale_canvas.ExtractImageRep().sk_bitmap();
mipmap.buildMipMap(true);
SkShader* bitmap_shader =
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 46af013..984b613 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -565,7 +565,7 @@ void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
gfx::Canvas background_canvas(size(), canvas->scale_factor(), false);
PaintInactiveTabBackground(&background_canvas);
- gfx::ImageSkia background_image(background_canvas.ExtractImageSkiaRep());
+ gfx::ImageSkia background_image(background_canvas.ExtractImageRep());
// Draw a radial gradient to hover_canvas.
gfx::Canvas hover_canvas(size(), canvas->scale_factor(), false);
@@ -595,7 +595,7 @@ void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
// Draw the radial gradient clipped to the background into hover_image.
gfx::ImageSkia hover_image = gfx::ImageSkiaOperations::CreateMaskedImage(
- gfx::ImageSkia(hover_canvas.ExtractImageSkiaRep()), background_image);
+ gfx::ImageSkia(hover_canvas.ExtractImageRep()), background_image);
// Draw the tab background to the canvas.
canvas->DrawImageInt(background_image, 0, 0);
@@ -677,11 +677,11 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
height() - drop_shadow_height() - kToolbarOverlap - tab_image->y_offset);
canvas->DrawImageInt(
- gfx::ImageSkia(background_canvas.ExtractImageSkiaRep()), 0, 0);
+ gfx::ImageSkia(background_canvas.ExtractImageRep()), 0, 0);
if (!GetThemeProvider()->HasCustomImage(tab_id) &&
hover_controller().ShouldDraw()) {
- hover_controller().Draw(canvas, background_canvas.ExtractImageSkiaRep());
+ hover_controller().Draw(canvas, background_canvas.ExtractImageRep());
}
// Now draw the highlights/shadows around the tab edge.
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 1bdccf8..3e773c0 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -436,7 +436,7 @@ gfx::ImageSkia NewTabButton::GetBackgroundImage(
canvas.FillRect(gfx::Rect(size()), SkColorSetARGB(64, 255, 255, 255));
return gfx::ImageSkiaOperations::CreateMaskedImage(
- gfx::ImageSkia(canvas.ExtractImageSkiaRep()), *mask);
+ gfx::ImageSkia(canvas.ExtractImageRep()), *mask);
}
gfx::ImageSkia NewTabButton::GetImageForState(
@@ -467,7 +467,7 @@ gfx::ImageSkia NewTabButton::GetImageForState(
canvas.DrawImageInt(*overlay, 0, 0);
canvas.Restore();
- return gfx::ImageSkia(canvas.ExtractImageSkiaRep());
+ return gfx::ImageSkia(canvas.ExtractImageRep());
}
gfx::ImageSkia NewTabButton::GetImage(ui::ScaleFactor scale_factor) const {
diff --git a/chrome/browser/ui/views/theme_helpers.cc b/chrome/browser/ui/views/theme_helpers.cc
index 954a745..833f49c 100644
--- a/chrome/browser/ui/views/theme_helpers.cc
+++ b/chrome/browser/ui/views/theme_helpers.cc
@@ -23,7 +23,7 @@ void GetRebarGradientColors(int width, int x1, int x2,
// those so calling code can use them to create gradient brushes for use in
// rendering in other directions.
- gfx::Canvas canvas(gfx::Size(width, 1), true);
+ gfx::Canvas canvas(gfx::Size(width, 1), ui::SCALE_FACTOR_100P, true);
// Render the Rebar gradient into the DIB
CTheme theme;
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index e391b54..14ea6fa 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -60,14 +60,15 @@ SkBitmap GetGAIAPictureForNTP(const gfx::Image& image) {
SkBitmap bmp = skia::ImageOperations::Resize(*image.ToSkBitmap(),
skia::ImageOperations::RESIZE_BEST, kLength, kLength);
- gfx::Canvas canvas(gfx::Size(kLength, kLength), false);
+ gfx::Canvas canvas(gfx::Size(kLength, kLength), ui::SCALE_FACTOR_100P,
+ false);
canvas.DrawImageInt(bmp, 0, 0);
// Draw a gray border on the inside of the icon.
SkColor color = SkColorSetARGB(83, 0, 0, 0);
canvas.DrawRect(gfx::Rect(0, 0, kLength - 1, kLength - 1), color);
- return canvas.ExtractBitmap();
+ return canvas.ExtractImageRep().sk_bitmap();
}
// Puts the |content| into a span with the given CSS class.
generated by cgit v1.1 at 2025-05-22 12:40:51 +0000