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

Issue 65012: Move skia to DEPS, and put it in third_party. (Closed)

Created:
11 years, 8 months ago by Stephen White
Modified:
9 years, 7 months ago
Reviewers:
brettw
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

This CL updates chrome to the latest version of skia, retrieved via DEPS, and placed in third_party. All relevant skia changes (for all 3 platforms) have been upstreamed. Most of this CL is mind-numbingly repetitive. Things of interest are: skia.gyp (now points at third_party versions), DEPS, and SkUserConfig.h. stdint.h: Skia now requires C99 integer types, which MSVC doesn't support natively. I have put typedefs in config/win/stdint.h. Note that the new version of skia appears to render rects whose coordinates are "backwards" (ie., x2 < x1 or y2 < y1), which were formerly culled. There were a couple obvious instances of this in the code which I fixed, but there may be more. There were ~35 layout test failures due to minor pixel differences which I rebaselined on Windows and Linux, and 8 genuine failures related to masks and stroked text, which I have put in text_expectations.txt and assigned to myself. (There was another change which broke ~1700 tests on each platform, but I put that change behind an #ifdef for now). R=brettw Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=15949

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : '' #

Patch Set 4 : '' #

Patch Set 5 : '' #

Patch Set 6 : '' #

Patch Set 7 : '' #

Patch Set 8 : '' #

Patch Set 9 : '' #

Patch Set 10 : '' #

Patch Set 11 : '' #

Patch Set 12 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+948 lines, -755 lines) Patch
M DEPS View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +3 lines, -0 lines 0 comments Download
M app/gfx/chrome_canvas.cc View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/chrome_canvas_win.cc View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/chrome_font.h View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/chrome_font_skia.cc View 9 10 11 3 chunks +7 lines, -6 lines 0 comments Download
M app/gfx/color_utils.h View 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/color_utils.cc View 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/icon_util.cc View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M app/gfx/icon_util_unittest.cc View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M app/theme_provider.h View 1 chunk +1 line, -1 line 0 comments Download
M base/gfx/jpeg_codec.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M base/gfx/native_theme.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M base/gfx/native_theme.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M base/gfx/png_decoder.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M base/gfx/png_encoder.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/app/chrome_dll_main.cc View 9 10 11 2 chunks +0 lines, -7 lines 0 comments Download
M chrome/browser/autocomplete/autocomplete_edit.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/bookmarks/bookmark_model.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/browser.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chrome_plugin_host.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/cocoa/location_bar_view_mac.mm View 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/download/download_util.cc View 11 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/extensions/extension_view.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/gears_integration.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/gtk/location_bar_view_gtk.cc View 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/gtk/menu_gtk.cc View 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/gtk/sad_tab_gtk.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/gtk/tabs/tab_renderer_gtk.h View 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/history/page_usage_data.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/history/thumbnail_database.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/history/thumbnail_database.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/icon_loader.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/renderer_host/backing_store_mac.cc View 9 10 11 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/renderer_host/browser_render_process_host.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/renderer_host/render_view_host.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/renderer_host/render_widget_host_view.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/tab_contents/infobar_delegate.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/tab_contents/navigation_entry.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/toolbar_model.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/bookmark_bar_view.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/find_bar_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/hwnd_html_view.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/keyword_editor_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/options/content_page_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/options/fonts_page_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/options/general_page_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/options/languages_page_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/page_info_window.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/sad_tab_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/status_bubble_views.cc View 11 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/views/tabs/dragged_tab_controller.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/tabs/dragged_tab_view.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/tabs/dragged_tab_view.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/views/tabs/hwnd_photobooth.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/webdata/web_database.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/webdata/web_database_unittest.cc View 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/common/gtk_util.cc View 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/common/render_messages.h View 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/common/render_messages_internal.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/common/security_filter_peer.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/common/temp_scaffolding_stubs.h View 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/renderer/render_view.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/renderer/render_widget.h View 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/renderer/render_widget.cc View 5 6 7 8 9 10 11 1 chunk +3 lines, -3 lines 0 comments Download
A skia/config/SkUserConfig.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +222 lines, -0 lines 0 comments Download
A skia/config/win/stdint.h View 1 chunk +26 lines, -0 lines 0 comments Download
A skia/ext/SkMemory_new_handler.cpp View 9 1 chunk +58 lines, -0 lines 0 comments Download
A skia/ext/SkTypeface_fake.cpp View 1 chunk +17 lines, -0 lines 0 comments Download
M skia/ext/image_operations.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M skia/ext/image_operations_unittest.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M skia/ext/skia_utils.cc View 11 1 chunk +1 line, -2 lines 0 comments Download
M skia/ext/skia_utils_unittest.cc View 11 1 chunk +1 line, -1 line 0 comments Download
D skia/precompiled.vsprops View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -13 lines 0 comments Download
M skia/skia.gyp View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +509 lines, -615 lines 0 comments Download
D skia/skia.vsprops View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -14 lines 0 comments Download
M skia/using_skia.vsprops View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M views/background.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/background.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/border.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/button/image_button.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/button/text_button.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/image_view.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/label.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/menu/chrome_menu.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/scrollbar/bitmap_scroll_bar.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/tabbed_pane.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/table/table_view.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/table/table_view.cc View 11 1 chunk +2 lines, -2 lines 0 comments Download
M views/controls/text_field.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/controls/throbber.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/focus/focus_manager_unittest.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/painter.h View 11 1 chunk +1 line, -1 line 0 comments Download
M views/painter.cc View 11 1 chunk +2 lines, -2 lines 0 comments Download
M views/view.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/widget/root_view_gtk.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M views/window/window_delegate.cc View 11 1 chunk +1 line, -1 line 0 comments Download
M webkit/glue/image_resource_fetcher.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M webkit/glue/webcursor_win.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M webkit/glue/webkit_glue.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M webkit/tools/layout_tests/test_expectations.txt View 1 chunk +7 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Stephen White
11 years, 8 months ago (2009-04-28 19:11:20 UTC) #1
This CL updates chrome to the latest version of skia, retrieved via DEPS, and
placed in third_party.  All relevant skia changes (for all 3 platforms) have
been upstreamed.

Most of this CL is mind-numbingly repetitive.  Things of interest are:  skia.gyp
(now points at third_party versions), DEPS, and SkUserConfig.h.  stdint.h:  Skia
now requires C99 integer types, which MSVC doesn't support natively.  I have put
typedefs in config/win/stdint.h.

I didn't remove the old version of skia from our directory in this CL, since gcl
chokes when I try to upload it.  I also didn't upload the 1694 layout tests
which will be rebaselined by this change, but I will commit them.  I ran
perceptualdiff on them, and they all passed (they're LSB differences).

Finally, there are some minor webkit changes required for this move, which can
be found in codereview.chromium.org/73047.  I can't submit these to webkit yet,
due to timing issues (if it goes in webkit before this CL goes in, it'll break
on the next merge, so I planned to commit them locally in this CL and upstream
afterwards.

Powered by Google App Engine
This is Rietveld 408576698