diff options
Diffstat (limited to 'chrome')
50 files changed, 56 insertions, 63 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index e5f5b3c..be727ef 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -63,7 +63,6 @@ #if defined(OS_MACOSX) #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" #endif -#include "skia/include/corecg/SkTypes.h" extern int BrowserMain(const MainFunctionParams&); extern int RendererMain(const MainFunctionParams&); @@ -114,12 +113,6 @@ void PureCall() { } void OnNoMemory() { - // Skia indicates that it can safely handle some NULL allocs by clearing - // this flag. In this case, we'll ignore the new_handler and won't crash. - if (!sk_malloc_will_throw()) { - return; - } - // Kill the process. This is important for security, since WebKit doesn't // NULL-check many memory allocations. If a malloc fails, returns NULL, and // the buffer is then used, it provides a handy mapping of memory starting at diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 98473ed..2ab706b3 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -17,7 +17,7 @@ #include "chrome/common/notification_service.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_util.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" /////////////////////////////////////////////////////////////////////////////// // AutocompleteEditModel diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index c0451e5..ac32fc0 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -20,7 +20,7 @@ #include "chrome/browser/history/history_types.h" #include "chrome/common/notification_observer.h" #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "views/controls/tree/tree_node_model.h" diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 030d6b8..68c7037 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -25,7 +25,7 @@ #include "base/gfx/rect.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" class BrowserIdleTimer; class BrowserWindow; diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 66c0183..08ad7e7 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -41,7 +41,7 @@ #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_error_job.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" using base::TimeDelta; diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm index 138a567..7da3091 100644 --- a/chrome/browser/cocoa/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar_view_mac.mm @@ -10,7 +10,7 @@ #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/command_updater.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" // TODO(shess): This code is mostly copied from the gtk // implementation. Make sure it's all appropriate and flesh it out. diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 82b01b9..111baeb 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -19,8 +19,8 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" -#include "skia/include/SkPath.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkShader.h" #if defined(OS_WIN) #include "app/os_exchange_data.h" diff --git a/chrome/browser/extensions/extension_view.h b/chrome/browser/extensions/extension_view.h index 5b3efc5..d58fdc7 100644 --- a/chrome/browser/extensions/extension_view.h +++ b/chrome/browser/extensions/extension_view.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/extensions/extension_host.h" #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" // TODO(port): Port these files. #if defined(OS_WIN) diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc index 92f031f..6805175 100644 --- a/chrome/browser/gears_integration.cc +++ b/chrome/browser/gears_integration.cc @@ -13,7 +13,7 @@ #include "chrome/common/gears_api.h" #include "googleurl/src/gurl.h" #include "net/base/base64.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/dom_operations.h" // The following 2 helpers are borrowed from the Gears codebase. diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 5fa71e0..46ee12c 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -18,7 +18,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gtk_util.h" #include "chrome/common/page_transition_types.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/window_open_disposition.h" namespace { diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index ca3da0e..5ffac91 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -9,7 +9,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "chrome/common/gtk_util.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, const MenuCreateMaterial* menu_data, diff --git a/chrome/browser/gtk/sad_tab_gtk.cc b/chrome/browser/gtk/sad_tab_gtk.cc index e11f3aa..4ec8e19 100644 --- a/chrome/browser/gtk/sad_tab_gtk.cc +++ b/chrome/browser/gtk/sad_tab_gtk.cc @@ -15,7 +15,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" -#include "skia/include/SkGradientShader.h" +#include "third_party/skia/include/effects/SkGradientShader.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index a2f4721..e3d3a91 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/gfx/rect.h" #include "chrome/common/owned_widget_gtk.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" namespace gfx { class Size; diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h index e281078..57b0be1 100644 --- a/chrome/browser/history/page_usage_data.h +++ b/chrome/browser/history/page_usage_data.h @@ -9,7 +9,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index fcd5332..cab27dc 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -12,7 +12,7 @@ #include "chrome/browser/history/url_database.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/thumbnail_score.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" using base::Time; diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h index e774a86..50ee8aa 100644 --- a/chrome/browser/history/thumbnail_database.h +++ b/chrome/browser/history/thumbnail_database.h @@ -12,7 +12,7 @@ #include "chrome/browser/history/url_database.h" // For DBCloseScoper. #include "chrome/browser/meta_table_helper.h" #include "chrome/common/sqlite_compiled_statement.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" struct sqlite3; struct ThumbnailScore; diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 6896427..75335a7 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" IconLoader::IconLoader(const IconGroupID& group, IconSize size, Delegate* delegate) diff --git a/chrome/browser/renderer_host/backing_store_mac.cc b/chrome/browser/renderer_host/backing_store_mac.cc index cacc6f0..1d00d28 100644 --- a/chrome/browser/renderer_host/backing_store_mac.cc +++ b/chrome/browser/renderer_host/backing_store_mac.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/common/transport_dib.h" #include "skia/ext/platform_canvas.h" -#include "skia/include/SkBitmap.h" -#include "skia/include/SkCanvas.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkCanvas.h" BackingStore::BackingStore(const gfx::Size& size) : size_(size) { diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index f960a1e..b5f9b4b 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -67,7 +67,7 @@ using WebKit::WebCache; #include "chrome/common/temp_scaffolding_stubs.h" #endif -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" // This class creates the IO thread for the renderer when running in diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 0083ad9..0f3141f 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -37,7 +37,7 @@ #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/api/public/WebFindOptions.h" #include "webkit/glue/autofill_form.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h index 2e1d1b5..979f22b 100644 --- a/chrome/browser/renderer_host/render_widget_host_view.h +++ b/chrome/browser/renderer_host/render_widget_host_view.h @@ -7,7 +7,7 @@ #include "base/gfx/native_widget_types.h" #include "base/shared_memory.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/webwidget_delegate.h" diff --git a/chrome/browser/tab_contents/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h index 25db94d..6f44dd2 100644 --- a/chrome/browser/tab_contents/infobar_delegate.h +++ b/chrome/browser/tab_contents/infobar_delegate.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/window_open_disposition.h" class AlertInfoBarDelegate; diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h index fb8a225..8e55746 100644 --- a/chrome/browser/tab_contents/navigation_entry.h +++ b/chrome/browser/tab_contents/navigation_entry.h @@ -13,7 +13,7 @@ #include "chrome/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" class NavigationController; diff --git a/chrome/browser/toolbar_model.h b/chrome/browser/toolbar_model.h index daf3cea..e0935fd 100644 --- a/chrome/browser/toolbar_model.h +++ b/chrome/browser/toolbar_model.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "skia/include/SkColor.h" +#include "third_party/skia/include/core/SkColor.h" class NavigationController; class NavigationEntry; diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index c133ee7..d62465f 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -18,7 +18,7 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkShader.h" #include "third_party/icu38/public/common/unicode/ubidi.h" #include "views/widget/widget.h" diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index f9d3ee0..a56f51a 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -15,7 +15,7 @@ #include "views/controls/menu/menu.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/view.h" -#include "skia/include/corecg/SkRect.h" +#include "third_party/skia/include/core/SkRect.h" class Browser; class PageNavigator; diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 246857f..f027535 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -16,7 +16,7 @@ #include "chrome/browser/view_ids.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "skia/include/SkGradientShader.h" +#include "third_party/skia/include/effects/SkGradientShader.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h index 699b67f..5cd9dee 100644 --- a/chrome/browser/views/hwnd_html_view.h +++ b/chrome/browser/views/hwnd_html_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_HWND_HTML_VIEW_H_ #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/hwnd_view.h" class RenderViewHost; diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 4dd4296..8f67db9 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -23,7 +23,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/background.h" #include "views/grid_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index badd2f6..abd1d9b 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -26,7 +26,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_win.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/radio_button.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index d9256ea..09db2ff 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -26,7 +26,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/locale_settings.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/native_button.h" #include "views/controls/text_field.h" #include "views/grid_layout.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 2726b83..eb4675c 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -31,7 +31,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 06d2ad1..ef26566 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -26,7 +26,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "unicode/uloc.h" #include "views/controls/button/radio_button.h" #include "views/controls/combo_box.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index b2f8a68..3c045b7 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -24,7 +24,7 @@ #include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/x509_certificate.h" -#include "skia/include/SkColor.h" +#include "third_party/skia/include/core/SkColor.h" #include "views/background.h" #include "views/grid_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index ea52cc0..71313cc 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -11,7 +11,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" -#include "skia/include/SkGradientShader.h" +#include "third_party/skia/include/effects/SkGradientShader.h" static const int kSadTabOffset = -64; static const int kIconTitleSpacing = 20; diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index e47b4ea..3e4d7c4 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -17,9 +17,9 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" -#include "skia/include/SkPaint.h" -#include "skia/include/SkPath.h" -#include "skia/include/corecg/SkRect.h" +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkRect.h" #include "views/controls/label.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 56ed9c7..bcc4b8c 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -22,7 +22,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "grit/theme_resources.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/event.h" #include "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 df143e5..ae42710 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -9,7 +9,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" #include "chrome/browser/views/tabs/tab_renderer.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkShader.h" #include "views/widget/widget_win.h" const int kTransparentAlpha = 200; diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h index f73d8eb..1ee9d25 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ b/chrome/browser/views/tabs/dragged_tab_view.h @@ -9,7 +9,7 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/task.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/view.h" namespace views { diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc index 8d59592..79de995 100644 --- a/chrome/browser/views/tabs/hwnd_photobooth.cc +++ b/chrome/browser/views/tabs/hwnd_photobooth.cc @@ -6,7 +6,7 @@ #include "base/gfx/point.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "views/widget/widget_win.h" namespace { diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h index 04250d9..3b5197b 100644 --- a/chrome/browser/webdata/web_database.h +++ b/chrome/browser/webdata/web_database.h @@ -12,7 +12,7 @@ #include "chrome/browser/meta_table_helper.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/sqlite_utils.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/glue/autofill_form.h" diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc index 2a7b5f9..4c27b1e 100644 --- a/chrome/browser/webdata/web_database_unittest.cc +++ b/chrome/browser/webdata/web_database_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_paths.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/autofill_form.h" #include "webkit/glue/password_form.h" diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc index a12def3..d246ccc 100644 --- a/chrome/common/gtk_util.cc +++ b/chrome/common/gtk_util.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 41139e7..768cd85 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -40,7 +40,7 @@ #include "webkit/glue/webview_delegate.h" #if defined(OS_POSIX) -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #endif namespace base { diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 90882c1..c413dbf 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -18,7 +18,7 @@ #include "base/shared_memory.h" #include "chrome/common/ipc_message_macros.h" #include "chrome/common/transport_dib.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/webappcachecontext.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index 3b1c9f0..fbd6c51 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -13,8 +13,8 @@ #include "grit/renderer_resources.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" -#include "skia/include/SkBitmap.h" -#include "skia/include/SkCanvas.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkCanvas.h" #include "webkit/glue/webkit_glue.h" #include "SkDevice.h" diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 8d2a047..35904d2 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -21,7 +21,7 @@ #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" class BookmarkContextMenu; class BookmarkNode; diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index a993327..678dbb5 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -23,7 +23,7 @@ #include "chrome/renderer/extensions/extension_process_bindings.h" #include "chrome/renderer/external_host_bindings.h" #include "chrome/renderer/render_widget.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/api/public/WebConsoleMessage.h" #include "webkit/glue/dom_serializer_delegate.h" diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index db181bd..25afdbb 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -14,14 +14,14 @@ #include "chrome/common/transport_dib.h" #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkShader.h" #include "webkit/api/public/WebRect.h" #include "webkit/api/public/WebScreenInfo.h" #include "webkit/api/public/WebSize.h" #if defined(OS_POSIX) -#include "skia/include/SkPixelRef.h" -#include "skia/include/SkMallocPixelRef.h" +#include "third_party/skia/include/core/SkPixelRef.h" +#include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) #include "webkit/glue/webtextdirection.h" diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index d2cdf96..a337f54 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -16,7 +16,7 @@ #include "chrome/common/ipc_channel.h" #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/api/public/WebRect.h" #include "webkit/glue/webwidget_delegate.h" |