diff options
Diffstat (limited to 'chrome')
86 files changed, 84 insertions, 966 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 53fd027..70df68c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -6,6 +6,7 @@ #include <locale> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/base_drag_source.h" @@ -32,7 +33,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/location_bar_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/utils.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc index 9bf4cb9..65b4f34 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc @@ -11,6 +11,7 @@ #include <atlmisc.h> #include <cmath> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -27,7 +28,6 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/notification_service.h" #include "chrome/views/view.h" diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index 003e3d2..cfd53a8 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/debugger/debugger_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/controls/scroll_view.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 8b16539..b5269d1 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -8,6 +8,7 @@ #include "chrome/browser/download/download_util.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" @@ -18,7 +19,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/drag_utils.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index d85d080..2cef2ec 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -8,6 +8,7 @@ #include <shlobj.h> #include <shobjidl.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -15,7 +16,6 @@ #include "base/gfx/point.h" #include "base/string_util.h" #include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index 81f2688..4d576a2 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -8,10 +8,10 @@ #include <gtk/gtk.h> #include "app/animation.h" +#include "app/gfx/chrome_canvas.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/gfx/rect.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/owned_widget_gtk.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index b4987a5..15d1950 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -13,7 +14,6 @@ #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc index cea36c9..1d0c205 100644 --- a/chrome/browser/renderer_host/render_widget_host_unittest.cc +++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/gfx/chrome_canvas.h" #include "base/basictypes.h" #include "base/keyboard_codes.h" #include "base/scoped_ptr.h" @@ -9,7 +10,6 @@ #include "build/build_config.h" #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/test_render_view_host.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/render_messages.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 75a2b03..31fc946 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -22,7 +23,6 @@ #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc index a1805a1..8ea2160 100644 --- a/chrome/browser/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/tab_contents/tab_contents_view_win.cc @@ -6,6 +6,7 @@ #include <windows.h> +#include "app/gfx/chrome_canvas.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/browser_process.h" @@ -21,7 +22,6 @@ #include "chrome/browser/tab_contents/web_drag_source.h" #include "chrome/browser/tab_contents/web_drop_target.h" #include "chrome/browser/views/sad_tab_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/url_constants.h" #include "chrome/views/focus/view_storage.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 38c658b..0e9b385 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -6,6 +6,7 @@ #include <commdlg.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" @@ -13,7 +14,6 @@ #include "base/win_util.h" #include "base/word_iterator.h" #include "chrome/browser/browser_list.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/restart_message_box.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 4fed441..70efbc9 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -6,12 +6,12 @@ #include <dwmapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/path.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 9220049..3d8bf6b 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,13 +12,13 @@ #include <math.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6cc1554..19dfa90 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -6,6 +6,7 @@ #include <limits> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -25,7 +26,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/event_utils.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 7bb4cce..d731fac 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" @@ -14,7 +15,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 585f6a4..4be9ec3 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "base/thread.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" @@ -21,7 +22,6 @@ #include "chrome/browser/views/bookmark_folder_tree_view.h" #include "chrome/browser/views/bookmark_table_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index cf115a4..61be2b0 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_table_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -11,7 +12,6 @@ #include "chrome/browser/bookmarks/bookmark_table_model.h" #include "chrome/browser/profile.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index fbe8264..ab42c6b 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/constrained_window_impl.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" @@ -17,7 +18,6 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/text_elider.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 5653fda..17a6108 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_path.h" @@ -14,7 +15,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 8b52280..9b97983 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" @@ -14,7 +15,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/download_item_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 7c7a26a..1ca1c22 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index ea92f19..880f011 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/browser_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -47,7 +48,6 @@ #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 89438b3..b8758b9 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/frame/glass_browser_frame_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 23ea9ae..24bcc2b 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index e490995..ad534f5 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/fullscreen_exit_bubble.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 9d37319..fb048b3 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/hung_renderer_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -11,7 +12,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 633de1b..8fe97d8 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/info_bubble.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 86ec619..c22fa5c 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/infobars/infobars.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 41d0953..0686de8 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/location_bar_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/path_service.h" @@ -25,7 +26,6 @@ #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/first_run_bubble.h" #include "chrome/browser/views/page_info_window.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/background.h" #include "chrome/views/border.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 52cdd16..c3ef712 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -12,6 +12,7 @@ #include <vsstyle.h> #include <vssym32.h> +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" @@ -29,7 +30,6 @@ #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/filter_policy.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 095ea36..f289f09 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/views/options/content_page_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/passwords_exceptions_window_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f428ff1..b539aec 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,13 +6,13 @@ #include "chrome/browser/views/options/cookies_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/win_util.h" #include "chrome/views/border.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 554acb3..a026b4d 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,6 +11,7 @@ #include <vector> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index c960f13..8337676 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -8,6 +8,7 @@ #include "chrome/browser/views/options/languages_page_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index a6071dc..fa4fd97 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,12 +7,12 @@ #include "chrome/browser/views/options/options_group_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/separator.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 1653894..ea52cc0 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/sad_tab_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index d350972..01ab0b3 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/star_toggle.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/theme_resources.h" StarToggle::StarToggle(Delegate* delegate) diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index cf8a18a..38eebbd 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,12 +6,12 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/animation.h" #include "app/resource_bundle.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/views/controls/label.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 43afd4f..0ae41cc 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -7,12 +7,12 @@ #include <windows.h> #include <shellapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 370a170..c53622f 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -8,6 +8,7 @@ #include <set> #include "app/animation.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/views/event.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 4f233d2..90e6d23 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/tabs/dragged_tab_view.h" -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc index f77f309..ba825b0 100644 --- a/chrome/browser/views/tabs/hwnd_photobooth.cc +++ b/chrome/browser/views/tabs/hwnd_photobooth.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/gfx/chrome_canvas.h" #include "base/gfx/point.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/widget/widget_win.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index ee2638f..0ed0368 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/tabs/tab.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 7f1d805..039954f 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,13 +6,13 @@ #include "chrome/browser/views/tabs/tab_renderer.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 0d314ab..ec487aa 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -18,7 +19,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc index a1b802f..af863f8 100644 --- a/chrome/browser/views/theme_helpers.cc +++ b/chrome/browser/views/theme_helpers.cc @@ -8,7 +8,7 @@ #include <atlapp.h> #include <atltheme.h> -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" #include "skia/ext/bitmap_platform_device_win.h" #include "SkGradientShader.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index d17fa46..333cc6c 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,6 +6,7 @@ #include <string> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -33,7 +34,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e48e4f6..99099a6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -126,6 +126,10 @@ # All .cc, .h, and .mm files under app/ except for tests. '../app/animation.cc', '../app/animation.h', + '../app/gfx/chrome_canvas.cc', + '../app/gfx/chrome_canvas.h', + '../app/gfx/chrome_canvas_linux.cc', + '../app/gfx/chrome_canvas_win.cc', '../app/l10n_util.cc', '../app/l10n_util.h', '../app/l10n_util_posix.cc', @@ -216,10 +220,6 @@ 'common/extensions/url_pattern.h', 'common/extensions/user_script.cc', 'common/extensions/user_script.h', - 'common/gfx/chrome_canvas.cc', - 'common/gfx/chrome_canvas.h', - 'common/gfx/chrome_canvas_linux.cc', - 'common/gfx/chrome_canvas_win.cc', 'common/gfx/chrome_font.h', 'common/gfx/chrome_font_gtk.cc', 'common/gfx/chrome_font_mac.mm', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index e8519d6..f8b4613 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -149,18 +149,6 @@ Name="gfx" > <File - RelativePath=".\gfx\chrome_canvas.cc" - > - </File> - <File - RelativePath=".\gfx\chrome_canvas.h" - > - </File> - <File - RelativePath=".\gfx\chrome_canvas_win.cc" - > - </File> - <File RelativePath=".\gfx\chrome_font.h" > </File> diff --git a/chrome/common/gfx/chrome_canvas.cc b/chrome/common/gfx/chrome_canvas.cc deleted file mode 100644 index 328bf65..0000000 --- a/chrome/common/gfx/chrome_canvas.cc +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/common/gfx/chrome_canvas.h" - -#include <limits> - -#include "app/l10n_util.h" -#include "base/gfx/rect.h" -#include "base/logging.h" -#include "skia/include/SkShader.h" -#include "chrome/common/gfx/chrome_font.h" - -bool ChromeCanvas::GetClipRect(gfx::Rect* r) { - SkRect clip; - if (!getClipBounds(&clip)) { - if (r) - r->SetRect(0, 0, 0, 0); - return false; - } - r->SetRect(SkScalarRound(clip.fLeft), SkScalarRound(clip.fTop), - SkScalarRound(clip.fRight - clip.fLeft), - SkScalarRound(clip.fBottom - clip.fTop)); - return true; -} - -bool ChromeCanvas::ClipRectInt(int x, int y, int w, int h) { - SkRect new_clip; - new_clip.set(SkIntToScalar(x), SkIntToScalar(y), - SkIntToScalar(x + w), SkIntToScalar(y + h)); - return clipRect(new_clip); -} - -bool ChromeCanvas::IntersectsClipRectInt(int x, int y, int w, int h) { - SkRect clip; - return getClipBounds(&clip) && - clip.intersect(SkIntToScalar(x), SkIntToScalar(y), SkIntToScalar(x + w), - SkIntToScalar(y + h)); -} - -void ChromeCanvas::TranslateInt(int x, int y) { - translate(SkIntToScalar(x), SkIntToScalar(y)); -} - -void ChromeCanvas::ScaleInt(int x, int y) { - scale(SkIntToScalar(x), SkIntToScalar(y)); -} - -void ChromeCanvas::FillRectInt(const SkColor& color, - int x, int y, int w, int h) { - SkPaint paint; - paint.setColor(color); - paint.setStyle(SkPaint::kFill_Style); - paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); - FillRectInt(x, y, w, h, paint); -} - -void ChromeCanvas::FillRectInt(int x, int y, int w, int h, - const SkPaint& paint) { - SkIRect rc = {x, y, x + w, y + h}; - drawIRect(rc, paint); -} - -void ChromeCanvas::DrawRectInt(const SkColor& color, - int x, int y, int w, int h) { - DrawRectInt(color, x, y, w, h, SkPorterDuff::kSrcOver_Mode); -} - -void ChromeCanvas::DrawRectInt(const SkColor& color, - int x, int y, int w, int h, - SkPorterDuff::Mode mode) { - SkPaint paint; - paint.setColor(color); - paint.setStyle(SkPaint::kStroke_Style); - // Set a stroke width of 0, which will put us down the stroke rect path. If - // we set a stroke width of 1, for example, this will internally create a - // path and fill it, which causes problems near the edge of the canvas. - paint.setStrokeWidth(SkIntToScalar(0)); - paint.setPorterDuffXfermode(mode); - - SkIRect rc = {x, y, x + w, y + h}; - drawIRect(rc, paint); -} - -void ChromeCanvas::DrawLineInt(const SkColor& color, - int x1, int y1, int x2, int y2) { - SkPaint paint; - paint.setColor(color); - paint.setStrokeWidth(SkIntToScalar(1)); - drawLine(SkIntToScalar(x1), SkIntToScalar(y1), SkIntToScalar(x2), - SkIntToScalar(y2), paint); -} - -void ChromeCanvas::DrawFocusRect(int x, int y, int width, int height) { - // Create a 2D bitmap containing alternating on/off pixels - we do this - // so that you never get two pixels of the same color around the edges - // of the focus rect (this may mean that opposing edges of the rect may - // have a dot pattern out of phase to each other). - static SkBitmap* dots = NULL; - if (!dots) { - int col_pixels = 32; - int row_pixels = 32; - - dots = new SkBitmap; - dots->setConfig(SkBitmap::kARGB_8888_Config, col_pixels, row_pixels); - dots->allocPixels(); - dots->eraseARGB(0, 0, 0, 0); - - uint32_t* dot = dots->getAddr32(0, 0); - for (int i = 0; i < row_pixels; i++) { - for (int u = 0; u < col_pixels; u++) { - if ((u % 2 + i % 2) % 2 != 0) { - dot[i * row_pixels + u] = SK_ColorGRAY; - } - } - } - } - - // First the horizontal lines. - - // Make a shader for the bitmap with an origin of the box we'll draw. This - // shader is refcounted and will have an initial refcount of 1. - SkShader* shader = SkShader::CreateBitmapShader( - *dots, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); - // Assign the shader to the paint & release our reference. The paint will - // now own the shader and the shader will be destroyed when the paint goes - // out of scope. - SkPaint paint; - paint.setShader(shader); - shader->unref(); - - SkRect rect; - rect.set(SkIntToScalar(x), SkIntToScalar(y), - SkIntToScalar(x + width), SkIntToScalar(y + 1)); - drawRect(rect, paint); - rect.set(SkIntToScalar(x), SkIntToScalar(y + height - 1), - SkIntToScalar(x + width), SkIntToScalar(y + height)); - drawRect(rect, paint); - - rect.set(SkIntToScalar(x), SkIntToScalar(y), - SkIntToScalar(x + 1), SkIntToScalar(y + height)); - drawRect(rect, paint); - rect.set(SkIntToScalar(x + width - 1), SkIntToScalar(y), - SkIntToScalar(x + width), SkIntToScalar(y + height)); - drawRect(rect, paint); -} - -void ChromeCanvas::DrawBitmapInt(const SkBitmap& bitmap, int x, int y) { - drawBitmap(bitmap, SkIntToScalar(x), SkIntToScalar(y)); -} - -void ChromeCanvas::DrawBitmapInt(const SkBitmap& bitmap, int x, int y, - const SkPaint& paint) { - drawBitmap(bitmap, SkIntToScalar(x), SkIntToScalar(y), &paint); -} - -void ChromeCanvas::DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, - int src_w, int src_h, int dest_x, int dest_y, - int dest_w, int dest_h, - bool filter) { - SkPaint p; - DrawBitmapInt(bitmap, src_x, src_y, src_w, src_h, dest_x, dest_y, - dest_w, dest_h, filter, p); -} - -void ChromeCanvas::DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, - int src_w, int src_h, int dest_x, int dest_y, - int dest_w, int dest_h, - bool filter, const SkPaint& paint) { - DLOG_ASSERT(src_x + src_w < std::numeric_limits<int16_t>::max() && - src_y + src_h < std::numeric_limits<int16_t>::max()); - if (src_w <= 0 || src_h <= 0 || dest_w <= 0 || dest_h <= 0) { - NOTREACHED() << "Attempting to draw bitmap to/from an empty rect!"; - return; - } - - if (!IntersectsClipRectInt(dest_x, dest_y, dest_w, dest_h)) - return; - - SkRect dest_rect = { SkIntToScalar(dest_x), - SkIntToScalar(dest_y), - SkIntToScalar(dest_x + dest_w), - SkIntToScalar(dest_y + dest_h) }; - - if (src_w == dest_w && src_h == dest_h) { - // Workaround for apparent bug in Skia that causes image to occasionally - // shift. - SkIRect src_rect = { src_x, src_y, src_x + src_w, src_y + src_h }; - drawBitmapRect(bitmap, &src_rect, dest_rect, &paint); - return; - } - - // Make a bitmap shader that contains the bitmap we want to draw. This is - // basically what SkCanvas.drawBitmap does internally, but it gives us - // more control over quality and will use the mipmap in the source image if - // it has one, whereas drawBitmap won't. - SkShader* shader = SkShader::CreateBitmapShader(bitmap, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - SkMatrix shader_scale; - shader_scale.setScale(SkFloatToScalar(static_cast<float>(dest_w) / src_w), - SkFloatToScalar(static_cast<float>(dest_h) / src_h)); - shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y)); - shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y)); - shader->setLocalMatrix(shader_scale); - - // Set up our paint to use the shader & release our reference (now just owned - // by the paint). - SkPaint p(paint); - p.setFilterBitmap(filter); - p.setShader(shader); - shader->unref(); - - // The rect will be filled by the bitmap. - drawRect(dest_rect, p); -} - -void ChromeCanvas::DrawStringInt(const std::wstring& text, - const ChromeFont& font, - const SkColor& color, - int x, int y, - int w, int h) { - DrawStringInt(text, font, color, x, y, w, h, - l10n_util::DefaultCanvasTextAlignment()); -} - -void ChromeCanvas::TileImageInt(const SkBitmap& bitmap, - int x, int y, int w, int h) { - TileImageInt(bitmap, 0, 0, x, y, w, h); -} - -void ChromeCanvas::TileImageInt(const SkBitmap& bitmap, int src_x, int src_y, - int dest_x, int dest_y, int w, int h) { - if (!IntersectsClipRectInt(dest_x, dest_y, w, h)) - return; - - SkPaint paint; - - SkShader* shader = SkShader::CreateBitmapShader(bitmap, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - paint.setShader(shader); - paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); - - // CreateBitmapShader returns a Shader with a reference count of one, we - // need to unref after paint takes ownership of the shader. - shader->unref(); - save(); - translate(SkIntToScalar(dest_x - src_x), SkIntToScalar(dest_y - src_y)); - ClipRectInt(src_x, src_y, w, h); - drawPaint(paint); - restore(); -} - -SkBitmap ChromeCanvas::ExtractBitmap() { - const SkBitmap& device_bitmap = getDevice()->accessBitmap(false); - - // Make a bitmap to return, and a canvas to draw into it. We don't just want - // to call extractSubset or the copy constuctor, since we want an actual copy - // of the bitmap. - SkBitmap result; - device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config); - return result; -} diff --git a/chrome/common/gfx/chrome_canvas.h b/chrome/common/gfx/chrome_canvas.h deleted file mode 100644 index 72db8a5..0000000 --- a/chrome/common/gfx/chrome_canvas.h +++ /dev/null @@ -1,217 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_COMMON_GFX_CHROME_CANVAS_H_ -#define CHROME_COMMON_GFX_CHROME_CANVAS_H_ - -#if defined(OS_WIN) -#include <windows.h> -#endif - -#include <string> - -#include "base/basictypes.h" -#include "skia/ext/platform_canvas.h" - -class ChromeFont; -namespace gfx { -class Rect; -} - -#if defined(OS_LINUX) -typedef struct _cairo cairo_t; -#endif - -// ChromeCanvas is the SkCanvas used by Views for all painting. It -// provides a handful of methods for the common operations used throughout -// Views. With few exceptions, you should NOT create a ChromeCanvas directly, -// rather one will be passed to you via the various paint methods in view. -// -// All methods that take integer arguments (as is used throughout views) -// end with Int. If you need to use methods provided by the superclass -// you'll need to do a conversion. In particular you'll need to use -// macro SkIntToScalar(xxx), or if converting from a scalar to an integer -// SkScalarRound. -// -// A handful of methods in this class are overloaded providing an additional -// argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the -// source and destination colors are combined. Unless otherwise specified, -// the variant that does not take a SkPorterDuff::Mode uses a transfer mode -// of kSrcOver_Mode. -class ChromeCanvas : public skia::PlatformCanvas { - public: - // Specifies the alignment for text rendered with the DrawStringInt method. - enum { - TEXT_ALIGN_LEFT = 1, - TEXT_ALIGN_CENTER = 2, - TEXT_ALIGN_RIGHT = 4, - TEXT_VALIGN_TOP = 8, - TEXT_VALIGN_MIDDLE = 16, - TEXT_VALIGN_BOTTOM = 32, - - // Specifies the text consists of multiple lines. - MULTI_LINE = 64, - - // By default DrawStringInt does not process the prefix ('&') character - // specially. That is, the string "&foo" is rendered as "&foo". When - // rendering text from a resource that uses the prefix character for - // mnemonics, the prefix should be processed and can be rendered as an - // underline (SHOW_PREFIX), or not rendered at all (HIDE_PREFIX). - SHOW_PREFIX = 128, - HIDE_PREFIX = 256, - - // Prevent ellipsizing - NO_ELLIPSIS = 512, - - // Specifies if words can be split by new lines. - // This only works with MULTI_LINE. - CHARACTER_BREAK = 1024, - }; - - // Creates an empty ChromeCanvas. Callers must use initialize before using - // the canvas. - ChromeCanvas(); - - ChromeCanvas(int width, int height, bool is_opaque); - - virtual ~ChromeCanvas(); - - // Retrieves the clip rectangle and sets it in the specified rectangle if any. - // Returns true if the clip rect is non-empty. - bool GetClipRect(gfx::Rect* clip_rect); - - // Wrapper function that takes integer arguments. - // Returns true if the clip is non-empty. - // See clipRect for specifics. - bool ClipRectInt(int x, int y, int w, int h); - - // Test whether the provided rectangle intersects the current clip rect. - bool IntersectsClipRectInt(int x, int y, int w, int h); - - // Wrapper function that takes integer arguments. - // See translate() for specifics. - void TranslateInt(int x, int y); - - // Wrapper function that takes integer arguments. - // See scale() for specifics. - void ScaleInt(int x, int y); - - // Fills the given rectangle with the given paint's parameters. - void FillRectInt(int x, int y, int w, int h, const SkPaint& paint); - - // Fills the specified region with the specified color using a transfer - // mode of SkPorterDuff::kSrcOver_Mode. - void FillRectInt(const SkColor& color, int x, int y, int w, int h); - - // Draws a single pixel rect in the specified region with the specified - // color, using a transfer mode of SkPorterDuff::kSrcOver_Mode. - // - // NOTE: if you need a single pixel line, use DraLineInt. - void DrawRectInt(const SkColor& color, int x, int y, int w, int h); - - // Draws a single pixel rect in the specified region with the specified - // color and transfer mode. - // - // NOTE: if you need a single pixel line, use DraLineInt. - void DrawRectInt(const SkColor& color, int x, int y, int w, int h, - SkPorterDuff::Mode mode); - - // Draws a single pixel line with the specified color. - void DrawLineInt(const SkColor& color, int x1, int y1, int x2, int y2); - - // Draws a bitmap with the origin at the specified location. The upper left - // corner of the bitmap is rendered at the specified location. - void DrawBitmapInt(const SkBitmap& bitmap, int x, int y); - - // Draws a bitmap with the origin at the specified location, using the - // specified paint. The upper left corner of the bitmap is rendered at the - // specified location. - void DrawBitmapInt(const SkBitmap& bitmap, int x, int y, - const SkPaint& paint); - - // Draws a portion of a bitmap in the specified location. The src parameters - // correspond to the region of the bitmap to draw in the region defined - // by the dest coordinates. - // - // If the width or height of the source differs from that of the destination, - // the bitmap will be scaled. When scaling down, it is highly recommended - // that you call buildMipMap(false) on your bitmap to ensure that it has - // a mipmap, which will result in much higher-quality output. Set |filter| - // to use filtering for bitmaps, otherwise the nearest-neighbor algorithm - // is used for resampling. - // - // An optional custom SkPaint can be provided. - void DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, int src_w, - int src_h, int dest_x, int dest_y, int dest_w, int dest_h, - bool filter); - void DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, int src_w, - int src_h, int dest_x, int dest_y, int dest_w, int dest_h, - bool filter, const SkPaint& paint); - - // Draws text with the specified color, font and location. The text is - // aligned to the left, vertically centered, clipped to the region. If the - // text is too big, it is truncated and '...' is added to the end. - void DrawStringInt(const std::wstring& text, const ChromeFont& font, - const SkColor& color, int x, int y, int w, int h); - - // Draws text with the specified color, font and location. The last argument - // specifies flags for how the text should be rendered. It can be one of - // TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT or TEXT_ALIGN_LEFT. - void DrawStringInt(const std::wstring& text, const ChromeFont& font, - const SkColor& color, int x, int y, int w, int h, - int flags); - -#ifdef OS_WIN // Only implemented on Windows for now. - // Draws text with a 1-pixel halo around it of the given color. It allows - // ClearType to be drawn to an otherwise transparenct bitmap for drag images. - // Drag images have only 1-bit of transparency, so we don't do any fancy - // blurring. - void DrawStringWithHalo(const std::wstring& text, const ChromeFont& font, - const SkColor& text_color, const SkColor& halo_color, - int x, int y, int w, int h, int flags); -#endif - - // Draws a dotted gray rectangle used for focus purposes. - void DrawFocusRect(int x, int y, int width, int height); - - // Tiles the image in the specified region. - void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h); - void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y, - int dest_x, int dest_y, int w, int h); - - // Extracts a bitmap from the contents of this canvas. - SkBitmap ExtractBitmap(); - -#if defined(OS_LINUX) - // Applies current matrix on the canvas to the cairo context. This should be - // invoked anytime you plan on drawing directly to the cairo context. Be - // sure and set the matrix back to the identity when done. - void ApplySkiaMatrixToCairoContext(cairo_t* cr); -#endif - - // Compute the size required to draw some text with the provided font. - // Attempts to fit the text with the provided width and height. Increases - // height and then width as needed to make the text fit. This method - // supports multiple lines. - static void SizeStringInt(const std::wstring& test, const ChromeFont& font, - int *width, int* height, int flags); - - private: -#if defined(OS_WIN) - // Draws text with the specified color, font and location. The text is - // aligned to the left, vertically centered, clipped to the region. If the - // text is too big, it is truncated and '...' is added to the end. - void DrawStringInt(const std::wstring& text, HFONT font, - const SkColor& color, int x, int y, int w, int h, - int flags); -#endif - - DISALLOW_EVIL_CONSTRUCTORS(ChromeCanvas); -}; - -#if defined(OS_WIN) || defined(OS_LINUX) -typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint; -#endif - -#endif // CHROME_COMMON_GFX_CHROME_CANVAS_H_ diff --git a/chrome/common/gfx/chrome_canvas_linux.cc b/chrome/common/gfx/chrome_canvas_linux.cc deleted file mode 100644 index 5f8b430..0000000 --- a/chrome/common/gfx/chrome_canvas_linux.cc +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/common/gfx/chrome_canvas.h" - -#include <pango/pango.h> - -#include "base/gfx/rect.h" -#include "base/logging.h" -#include "base/string_util.h" -#include "chrome/common/gfx/chrome_font.h" - -namespace { - -// Returns a new pango font, free with pango_font_description_free(). -PangoFontDescription* PangoFontFromChromeFont(const ChromeFont& chrome_font) { - ChromeFont font = chrome_font; // Copy so we can call non-const methods. - PangoFontDescription* pfd = pango_font_description_new(); - pango_font_description_set_family(pfd, WideToUTF8(font.FontName()).c_str()); - pango_font_description_set_size(pfd, font.FontSize() * PANGO_SCALE); - - switch (font.style()) { - case ChromeFont::NORMAL: - // Nothing to do, should already be PANGO_STYLE_NORMAL. - break; - case ChromeFont::BOLD: - pango_font_description_set_weight(pfd, PANGO_WEIGHT_BOLD); - break; - case ChromeFont::ITALIC: - pango_font_description_set_style(pfd, PANGO_STYLE_ITALIC); - break; - case ChromeFont::UNDERLINED: - // TODO(deanm): How to do underlined? Where do we use it? Probably have - // to paint it ourselves, see pango_font_metrics_get_underline_position. - break; - } - - return pfd; -} - -} // namespace - -ChromeCanvas::ChromeCanvas(int width, int height, bool is_opaque) - : skia::PlatformCanvasLinux(width, height, is_opaque) { -} - -ChromeCanvas::ChromeCanvas() : skia::PlatformCanvasLinux() { -} - -ChromeCanvas::~ChromeCanvas() { -} - -// static -void ChromeCanvas::SizeStringInt(const std::wstring& text, - const ChromeFont& font, - int* width, int* height, int flags) { - NOTIMPLEMENTED(); -} - -void ChromeCanvas::ApplySkiaMatrixToCairoContext(cairo_t* cr) { - const SkMatrix& skia_matrix = getTotalMatrix(); - cairo_matrix_t cairo_matrix; - cairo_matrix_init(&cairo_matrix, - SkScalarToFloat(skia_matrix.getScaleX()), - SkScalarToFloat(skia_matrix.getSkewY()), - SkScalarToFloat(skia_matrix.getSkewX()), - SkScalarToFloat(skia_matrix.getScaleY()), - SkScalarToFloat(skia_matrix.getTranslateX()), - SkScalarToFloat(skia_matrix.getTranslateY())); - cairo_set_matrix(cr, &cairo_matrix); -} - -void ChromeCanvas::DrawStringInt(const std::wstring& text, - const ChromeFont& font, - const SkColor& color, int x, int y, int w, - int h, int flags) { - cairo_surface_t* surface = beginPlatformPaint(); - cairo_t* cr = cairo_create(surface); - // We're going to draw onto the surface directly. This circumvents the matrix - // installed by Skia. Apply the matrix from skia to cairo so they align and - // we draw at the right place. - ApplySkiaMatrixToCairoContext(cr); - PangoLayout* layout = pango_cairo_create_layout(cr); - - cairo_set_source_rgb(cr, - SkColorGetR(color) / 255.0, - SkColorGetG(color) / 255.0, - SkColorGetB(color) / 255.0); - - // TODO(deanm): Implement the rest of the ChromeCanvas flags. - if (!(flags & ChromeCanvas::NO_ELLIPSIS)) - pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); - - pango_layout_set_width(layout, w * PANGO_SCALE); - pango_layout_set_height(layout, h * PANGO_SCALE); - - std::string utf8 = WideToUTF8(text); - pango_layout_set_text(layout, utf8.data(), utf8.size()); - - PangoFontDescription* desc = PangoFontFromChromeFont(font); - pango_layout_set_font_description(layout, desc); - pango_font_description_free(desc); - - int width, height; - pango_layout_get_size(layout, &width, &height); - - if (flags & ChromeCanvas::TEXT_VALIGN_TOP) { - // Cairo should draw from the top left corner already. - } else if (flags & ChromeCanvas::TEXT_VALIGN_BOTTOM) { - y = y + (h - (height / PANGO_SCALE)); - } else { - // Vertically centered. - y = y + ((h - (height / PANGO_SCALE)) / 2); - } - - cairo_move_to(cr, x, y); - pango_cairo_show_layout(cr, layout); - - g_object_unref(layout); - cairo_destroy(cr); - // NOTE: beginPlatformPaint returned its surface, we shouldn't destroy it. -} diff --git a/chrome/common/gfx/chrome_canvas_win.cc b/chrome/common/gfx/chrome_canvas_win.cc deleted file mode 100644 index aefb640..0000000 --- a/chrome/common/gfx/chrome_canvas_win.cc +++ /dev/null @@ -1,264 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/common/gfx/chrome_canvas.h" - -#include <limits> - -#include "app/l10n_util.h" -#include "base/gfx/rect.h" -#include "skia/include/SkShader.h" -#include "chrome/common/gfx/chrome_font.h" - -namespace { - -// We make sure that LTR text we draw in an RTL context is modified -// appropriately to make sure it maintains it LTR orientation. -void DoDrawText(HDC hdc, const std::wstring& text, - RECT* text_bounds, int flags) { - std::wstring localized_text; - const wchar_t* string_ptr = text.c_str(); - int string_size = static_cast<int>(text.length()); - // Only adjust string directionality if both of the following are true: - // 1. The current locale is RTL. - // 2. The string itself has RTL directionality. - if (flags & DT_RTLREADING) { - if (l10n_util::AdjustStringForLocaleDirection(text, &localized_text)) { - string_ptr = localized_text.c_str(); - string_size = static_cast<int>(localized_text.length()); - } - } - - DrawText(hdc, string_ptr, string_size, text_bounds, flags); -} - -// Compute the windows flags necessary to implement the provided text -// ChromeCanvas flags. -int ComputeFormatFlags(int flags, const std::wstring& text) { - int f = 0; - - // Setting the text alignment explicitly in case it hasn't already been set. - // This will make sure that we don't align text to the left on RTL locales - // just because no alignment flag was passed to DrawStringInt(). - if (!(flags & (ChromeCanvas::TEXT_ALIGN_CENTER | - ChromeCanvas::TEXT_ALIGN_RIGHT | - ChromeCanvas::TEXT_ALIGN_LEFT))) { - flags |= l10n_util::DefaultCanvasTextAlignment(); - } - - if (flags & ChromeCanvas::HIDE_PREFIX) - f |= DT_HIDEPREFIX; - else if ((flags & ChromeCanvas::SHOW_PREFIX) == 0) - f |= DT_NOPREFIX; - - if (flags & ChromeCanvas::MULTI_LINE) { - f |= DT_WORDBREAK; - if (flags & ChromeCanvas::CHARACTER_BREAK) - f |= DT_EDITCONTROL; - } else { - f |= DT_SINGLELINE | DT_VCENTER; - if (!(flags & ChromeCanvas::NO_ELLIPSIS)) - f |= DT_END_ELLIPSIS; - } - - // vertical alignment - if (flags & ChromeCanvas::TEXT_VALIGN_TOP) - f |= DT_TOP; - else if (flags & ChromeCanvas::TEXT_VALIGN_BOTTOM) - f |= DT_BOTTOM; - else - f |= DT_VCENTER; - - // horizontal alignment - if (flags & ChromeCanvas::TEXT_ALIGN_CENTER) - f |= DT_CENTER; - else if (flags & ChromeCanvas::TEXT_ALIGN_RIGHT) - f |= DT_RIGHT; - else - f |= DT_LEFT; - - // In order to make sure RTL/BiDi strings are rendered correctly, we must - // pass the flag DT_RTLREADING to DrawText (when the locale's language is - // a right-to-left language) so that Windows does the right thing. - // - // In addition to correctly displaying text containing both RTL and LTR - // elements (for example, a string containing a telephone number within a - // sentence in Hebrew, or a sentence in Hebrew that contains a word in - // English) this flag also makes sure that if there is not enough space to - // display the entire string, the ellipsis is displayed on the left hand side - // of the truncated string and not on the right hand side. - // - // We make a distinction between Chrome UI strings and text coming from a web - // page. - // - // For text coming from a web page we determine the alignment based on the - // first character with strong directionality. If the directionality of the - // first character with strong directionality in the text is LTR, the - // alignment is set to DT_LEFT, and the directionality should not be set as - // DT_RTLREADING. - // - // This heuristic doesn't work for Chrome UI strings since even in RTL - // locales, some of those might start with English text but we know they're - // localized so we always want them to be right aligned, and their - // directionality should be set as DT_RTLREADING. - // - // Caveat: If the string is purely LTR, don't set DTL_RTLREADING since when - // the flag is set, LRE-PDF don't have the desired effect of rendering - // multiline English-only text as LTR. - if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT && - (f & DT_RIGHT)) { - if (l10n_util::StringContainsStrongRTLChars(text)) { - f |= DT_RTLREADING; - } - } - return f; -} - -} // anonymous namespace - -ChromeCanvas::ChromeCanvas(int width, int height, bool is_opaque) - : skia::PlatformCanvasWin(width, height, is_opaque) { -} - -ChromeCanvas::ChromeCanvas() : skia::PlatformCanvasWin() { -} - -ChromeCanvas::~ChromeCanvas() { -} - -// static -void ChromeCanvas::SizeStringInt(const std::wstring& text, - const ChromeFont& font, - int *width, int *height, int flags) { - HDC dc = GetDC(NULL); - HFONT old_font = static_cast<HFONT>(SelectObject(dc, font.hfont())); - RECT b; - b.left = 0; - b.top = 0; - b.right = *width; - if (b.right == 0 && !text.empty()) { - // Width needs to be at least 1 or else DoDrawText will not resize it. - b.right = 1; - } - b.bottom = *height; - DoDrawText(dc, text, &b, ComputeFormatFlags(flags, text) | DT_CALCRECT); - - // Restore the old font. This way we don't have to worry if the caller - // deletes the font and the DC lives longer. - SelectObject(dc, old_font); - *width = b.right; - *height = b.bottom; - - ReleaseDC(NULL, dc); -} - -void ChromeCanvas::DrawStringInt(const std::wstring& text, HFONT font, - const SkColor& color, int x, int y, int w, - int h, int flags) { - if (!IntersectsClipRectInt(x, y, w, h)) - return; - - RECT text_bounds = { x, y, x + w, y + h }; - HDC dc = beginPlatformPaint(); - SetBkMode(dc, TRANSPARENT); - HFONT old_font = (HFONT)SelectObject(dc, font); - COLORREF brush_color = RGB(SkColorGetR(color), SkColorGetG(color), - SkColorGetB(color)); - SetTextColor(dc, brush_color); - - int f = ComputeFormatFlags(flags, text); - DoDrawText(dc, text, &text_bounds, f); - endPlatformPaint(); - - // Restore the old font. This way we don't have to worry if the caller - // deletes the font and the DC lives longer. - SelectObject(dc, old_font); - - // Windows will have cleared the alpha channel of the text we drew. Assume - // we're drawing to an opaque surface, or at least the text rect area is - // opaque. - getTopPlatformDevice().makeOpaque(x, y, w, h); -} - -void ChromeCanvas::DrawStringInt(const std::wstring& text, - const ChromeFont& font, - const SkColor& color, - int x, int y, int w, int h, int flags) { - DrawStringInt(text, font.hfont(), color, x, y, w, h, flags); -} - -// Checks each pixel immediately adjacent to the given pixel in the bitmap. If -// any of them are not the halo color, returns true. This defines the halo of -// pixels that will appear around the text. Note that we have to check each -// pixel against both the halo color and transparent since DrawStringWithHalo -// will modify the bitmap as it goes, and clears pixels shouldn't count as -// changed. -static bool pixelShouldGetHalo(const SkBitmap& bitmap, int x, int y, - SkColor halo_color) { - if (x > 0 && - *bitmap.getAddr32(x - 1, y) != halo_color && - *bitmap.getAddr32(x - 1, y) != 0) - return true; // Touched pixel to the left. - if (x < bitmap.width() - 1 && - *bitmap.getAddr32(x + 1, y) != halo_color && - *bitmap.getAddr32(x + 1, y) != 0) - return true; // Touched pixel to the right. - if (y > 0 && - *bitmap.getAddr32(x, y - 1) != halo_color && - *bitmap.getAddr32(x, y - 1) != 0) - return true; // Touched pixel above. - if (y < bitmap.height() - 1 && - *bitmap.getAddr32(x, y + 1) != halo_color && - *bitmap.getAddr32(x, y + 1) != 0) - return true; // Touched pixel below. - return false; -} - -void ChromeCanvas::DrawStringWithHalo(const std::wstring& text, - const ChromeFont& font, - const SkColor& text_color, - const SkColor& halo_color_in, - int x, int y, int w, int h, - int flags) { - // Some callers will have semitransparent halo colors, which we don't handle - // (since the resulting image can have 1-bit transparency only). - SkColor halo_color = halo_color_in | 0xFF000000; - - // Create a temporary buffer filled with the halo color. It must leave room - // for the 1-pixel border around the text. - ChromeCanvas text_canvas(w + 2, h + 2, true); - SkPaint bkgnd_paint; - bkgnd_paint.setColor(halo_color); - text_canvas.FillRectInt(0, 0, w + 2, h + 2, bkgnd_paint); - - // Draw the text into the temporary buffer. This will have correct - // ClearType since the background color is the same as the halo color. - text_canvas.DrawStringInt(text, font, text_color, 1, 1, w, h, flags); - - // Windows will have cleared the alpha channel for the pixels it drew. Make it - // opaque. We have to do this first since pixelShouldGetHalo will check for - // 0 to see if a pixel has been modified to transparent, and black text that - // Windows draw will look transparent to it! - text_canvas.getTopPlatformDevice().makeOpaque(0, 0, w + 2, h + 2); - - uint32_t halo_premul = SkPreMultiplyColor(halo_color); - SkBitmap& text_bitmap = const_cast<SkBitmap&>( - text_canvas.getTopPlatformDevice().accessBitmap(true)); - for (int cur_y = 0; cur_y < h + 2; cur_y++) { - uint32_t* text_row = text_bitmap.getAddr32(0, cur_y); - for (int cur_x = 0; cur_x < w + 2; cur_x++) { - if (text_row[cur_x] == halo_premul) { - // This pixel was not touched by the text routines. See if it borders - // a touched pixel in any of the 4 directions (not diagonally). - if (!pixelShouldGetHalo(text_bitmap, cur_x, cur_y, halo_premul)) - text_row[cur_x] = 0; // Make transparent. - } else { - text_row[cur_x] |= 0xff << SK_A32_SHIFT; // Make opaque. - } - } - } - - // Draw the halo bitmap with blur. - drawBitmap(text_bitmap, SkIntToScalar(x - 1), SkIntToScalar(y - 1)); -} diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 0a3a412..f3b7e86 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -4,12 +4,12 @@ #include "chrome/plugin/webplugin_proxy.h" +#include "app/gfx/chrome_canvas.h" #include "base/scoped_handle.h" #include "base/shared_memory.h" #include "base/singleton.h" #include "base/waitable_event.h" #include "build/build_config.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_proxy.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index e911b09..9b2f8a3 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -10,6 +10,7 @@ #include <atlbase.h> #endif +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" @@ -18,7 +19,6 @@ #include "base/gfx/size.h" #include "base/gfx/native_widget_types.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" #include "chrome/plugin/npobject_proxy.h" diff --git a/chrome/views/background.cc b/chrome/views/background.cc index 3a7d8fc..656d0a1 100644 --- a/chrome/views/background.cc +++ b/chrome/views/background.cc @@ -4,8 +4,8 @@ #include "chrome/views/background.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/painter.h" #include "chrome/views/view.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/views/border.cc b/chrome/views/border.cc index 4be943f..ccc4185 100644 --- a/chrome/views/border.cc +++ b/chrome/views/border.cc @@ -4,8 +4,8 @@ #include "chrome/views/border.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" namespace views { diff --git a/chrome/views/controls/button/checkbox.cc b/chrome/views/controls/button/checkbox.cc index d0ec64a..2b15938 100644 --- a/chrome/views/controls/button/checkbox.cc +++ b/chrome/views/controls/button/checkbox.cc @@ -4,7 +4,7 @@ #include "chrome/views/controls/button/checkbox.h" -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "chrome/views/controls/label.h" namespace views { diff --git a/chrome/views/controls/button/image_button.cc b/chrome/views/controls/button/image_button.cc index 8b5ec86..3b0df8c 100644 --- a/chrome/views/controls/button/image_button.cc +++ b/chrome/views/controls/button/image_button.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/button/image_button.h" +#include "app/gfx/chrome_canvas.h" #include "app/throb_animation.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "skia/ext/image_operations.h" namespace views { diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc index a4ad6aa..f7e7136 100644 --- a/chrome/views/controls/button/menu_button.cc +++ b/chrome/views/controls/button/menu_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/menu_button.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/menu/view_menu_delegate.h" diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc index add909b..d175fd4 100644 --- a/chrome/views/controls/button/text_button.cc +++ b/chrome/views/controls/button/text_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/text_button.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/throb_animation.h" #include "app/resource_bundle.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/event.h" #include "grit/theme_resources.h" diff --git a/chrome/views/controls/combo_box.cc b/chrome/views/controls/combo_box.cc index 375dd3a7..db6c86b 100644 --- a/chrome/views/controls/combo_box.cc +++ b/chrome/views/controls/combo_box.cc @@ -4,11 +4,11 @@ #include "chrome/views/controls/combo_box.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/gfx/rect.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" // Limit how small a combobox can be. diff --git a/chrome/views/controls/hwnd_view.cc b/chrome/views/controls/hwnd_view.cc index b6ff61b..379345c 100644 --- a/chrome/views/controls/hwnd_view.cc +++ b/chrome/views/controls/hwnd_view.cc @@ -4,7 +4,7 @@ #include "chrome/views/controls/hwnd_view.h" -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/controls/image_view.cc b/chrome/views/controls/image_view.cc index a3892a9..f377adc 100644 --- a/chrome/views/controls/image_view.cc +++ b/chrome/views/controls/image_view.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/image_view.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" namespace views { diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc index 5ef0381..e0acde8 100644 --- a/chrome/views/controls/label.cc +++ b/chrome/views/controls/label.cc @@ -6,11 +6,11 @@ #include <math.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/text_elider.h" diff --git a/chrome/views/controls/label_unittest.cc b/chrome/views/controls/label_unittest.cc index b287c29..5a152c3 100644 --- a/chrome/views/controls/label_unittest.cc +++ b/chrome/views/controls/label_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/border.h" #include "chrome/views/controls/label.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc index ef398f4..c591a7e 100644 --- a/chrome/views/controls/menu/chrome_menu.cc +++ b/chrome/views/controls/menu/chrome_menu.cc @@ -8,6 +8,7 @@ #include <uxtheme.h> #include <Vssym32.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/base_drag_source.h" @@ -18,7 +19,6 @@ #include "base/win_util.h" // TODO(beng): (Cleanup) remove this browser dep. #include "chrome/browser/drag_utils.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/border.h" diff --git a/chrome/views/controls/menu/menu.cc b/chrome/views/controls/menu/menu.cc index e46eaa0..3e4e6ae 100644 --- a/chrome/views/controls/menu/menu.cc +++ b/chrome/views/controls/menu/menu.cc @@ -12,13 +12,13 @@ #include <atlmisc.h> #include <string> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/views/accelerator.h" diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc index da35a62..fbb0e99 100644 --- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/controls/menu/menu.h" #include "chrome/views/controls/scroll_view.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/controls/single_split_view.cc b/chrome/views/controls/single_split_view.cc index 9f87310..a16a767 100644 --- a/chrome/views/controls/single_split_view.cc +++ b/chrome/views/controls/single_split_view.cc @@ -4,7 +4,7 @@ #include "chrome/views/controls/single_split_view.h" -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc index 75d7f03..e0205a9 100644 --- a/chrome/views/controls/tabbed_pane.cc +++ b/chrome/views/controls/tabbed_pane.cc @@ -6,12 +6,12 @@ #include <vssym32.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/logging.h" #include "base/stl_util-inl.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/views/background.h" #include "chrome/views/fill_layout.h" diff --git a/chrome/views/controls/table/group_table_view.cc b/chrome/views/controls/table/group_table_view.cc index 7d65c32..5c87736 100644 --- a/chrome/views/controls/table/group_table_view.cc +++ b/chrome/views/controls/table/group_table_view.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/table/group_table_view.h" +#include "app/gfx/chrome_canvas.h" #include "base/message_loop.h" #include "base/task.h" -#include "chrome/common/gfx/chrome_canvas.h" namespace views { diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc index a794e91..ecb9773 100644 --- a/chrome/views/controls/table/table_view.cc +++ b/chrome/views/controls/table/table_view.cc @@ -7,11 +7,11 @@ #include <algorithm> #include <windowsx.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/win_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/win_util.h" diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc index 5bf9ce5..de2a651 100644 --- a/chrome/views/controls/throbber.cc +++ b/chrome/views/controls/throbber.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/throbber.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/time.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/logging_chrome.h" #include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc index 13e1914d..e657658 100644 --- a/chrome/views/controls/tree/tree_view.cc +++ b/chrome/views/controls/tree/tree_view.cc @@ -6,12 +6,12 @@ #include <shellapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/win_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/painter.cc b/chrome/views/painter.cc index bfddce5..464bba4 100644 --- a/chrome/views/painter.cc +++ b/chrome/views/painter.cc @@ -4,9 +4,9 @@ #include "chrome/views/painter.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "skia/include/SkBitmap.h" #include "skia/include/SkGradientShader.h" diff --git a/chrome/views/view.cc b/chrome/views/view.cc index 561ee70..22ab762 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -5,18 +5,17 @@ #include "chrome/views/view.h" #include <algorithm> - #ifndef NDEBUG #include <iostream> #endif +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" #include "base/string_util.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/layout_manager.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc index f38a5ee..ad14e81 100644 --- a/chrome/views/view_unittest.cc +++ b/chrome/views/view_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/gfx/chrome_canvas.h" #include "base/clipboard.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/views/background.h" diff --git a/chrome/views/view_win.cc b/chrome/views/view_win.cc index 5efdb99..41e97a9 100644 --- a/chrome/views/view_win.cc +++ b/chrome/views/view_win.cc @@ -4,10 +4,10 @@ #include "chrome/views/view.h" +#include "app/gfx/chrome_canvas.h" #include "base/scoped_handle.h" #include "base/string_util.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/accessibility/view_accessibility_wrapper.h" diff --git a/chrome/views/widget/root_view.cc b/chrome/views/widget/root_view.cc index f8135bb..8d7b047 100644 --- a/chrome/views/widget/root_view.cc +++ b/chrome/views/widget/root_view.cc @@ -6,13 +6,13 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #if defined(OS_WIN) #include "base/base_drag_source.h" #endif #include "base/logging.h" #include "base/message_loop.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #if defined(OS_WIN) #include "chrome/views/widget/root_view_drop_target.h" diff --git a/chrome/views/widget/root_view_gtk.cc b/chrome/views/widget/root_view_gtk.cc index 241e042..68d0947 100644 --- a/chrome/views/widget/root_view_gtk.cc +++ b/chrome/views/widget/root_view_gtk.cc @@ -4,8 +4,8 @@ #include "chrome/views/widget/root_view.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "skia/include/SkColor.h" namespace views { diff --git a/chrome/views/widget/root_view_win.cc b/chrome/views/widget/root_view_win.cc index 1beff61..17efd54 100644 --- a/chrome/views/widget/root_view_win.cc +++ b/chrome/views/widget/root_view_win.cc @@ -4,9 +4,9 @@ #include "chrome/views/widget/root_view.h" +#include "app/gfx/chrome_canvas.h" #include "base/base_drag_source.h" #include "base/logging.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/drag_drop_types.h" #include "chrome/views/widget/root_view_drop_target.h" diff --git a/chrome/views/widget/widget_win.cc b/chrome/views/widget/widget_win.cc index 3de8958..0bb3e78 100644 --- a/chrome/views/widget/widget_win.cc +++ b/chrome/views/widget/widget_win.cc @@ -4,11 +4,11 @@ #include "chrome/views/widget/widget_win.h" +#include "app/gfx/chrome_canvas.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/win_util.h" #include "chrome/views/accessibility/view_accessibility.h" diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc index e6524de..e3cdad6 100644 --- a/chrome/views/window/custom_frame_view.cc +++ b/chrome/views/window/custom_frame_view.cc @@ -4,10 +4,10 @@ #include "chrome/views/window/custom_frame_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/window/client_view.h" diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc index f60bd26..099ff60 100644 --- a/chrome/views/window/dialog_client_view.cc +++ b/chrome/views/window/dialog_client_view.cc @@ -8,11 +8,11 @@ #include <uxtheme.h> #include <vsstyle.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 0057177..9a603f9 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -6,11 +6,11 @@ #include <shellapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/gfx/path.h" |