diff options
author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 17:35:01 +0000 |
---|---|---|
committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 17:35:01 +0000 |
commit | 21c8f5b8e33e4e28f177abacb774cc1ba1ac137b (patch) | |
tree | 5b628bb9ccb41c29c24628acc44778982ff987ba /ui/gfx/path_x11.h | |
parent | 1104bc664b4ba077b107833142dbbfb407d0ee77 (diff) | |
download | chromium_src-21c8f5b8e33e4e28f177abacb774cc1ba1ac137b.zip chromium_src-21c8f5b8e33e4e28f177abacb774cc1ba1ac137b.tar.gz chromium_src-21c8f5b8e33e4e28f177abacb774cc1ba1ac137b.tar.bz2 |
Revert 233840 "Add CreateRegionFromSkRegion and update DesktopRo..."
Caused compile error on chrome os builders
e.g. http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/17724
chromeos-chrome-33.0.1704.0_alpha-r1: ui/gfx/path_x11.cc: In function '_XRegion* gfx::CreateRegionFromSkRegion(const SkRegion&)':
chromeos-chrome-33.0.1704.0_alpha-r1: ui/gfx/path_x11.cc:20:18: error: narrowing conversion of '(& i.SkRegion::Iterator::rect())->SkIRect::x()' from 'int' to 'short int' inside { } is ill-formed in C++11 [-Werror=narrowing]
chromeos-chrome-33.0.1704.0_alpha-r1: ui/gfx/path_x11.cc:20:32: error: narrowing conversion of '(& i.SkRegion::Iterator::rect())->SkIRect::y()' from 'int' to 'short int' inside { } is ill-formed in C++11 [-Werror=narrowing]
chromeos-chrome-33.0.1704.0_alpha-r1: ui/gfx/path_x11.cc:20:50: error: narrowing conversion of '(& i.SkRegion::Iterator::rect())->SkIRect::width()' from 'int' to 'short unsigned int' inside { } is ill-formed in C++11 [-Werror=narrowing]
chromeos-chrome-33.0.1704.0_alpha-r1: ui/gfx/path_x11.cc:20:69: error: narrowing conversion of '(& i.SkRegion::Iterator::rect())->SkIRect::height()' from 'int' to 'short unsigned int' inside { } is ill-formed in C++11 [-Werror=narrowing]
chromeos-chrome-33.0.1704.0_alpha-r1: cc1plus: all warnings being treated as errors
> Add CreateRegionFromSkRegion and update DesktopRootWindowHostX11 to use it.
>
> SkRegion can now be converted directly to an X11 Region, rather than via SkPath, thereby avoiding the lack of support for non-contiguous regions in the SkPath to Region conversion step.
>
> This CL is deliberately a minimal fix, suitable for merging.
>
> BUG=315236
>
> Review URL: https://codereview.chromium.org/65463002
TBR=wez@chromium.org
Review URL: https://codereview.chromium.org/66533003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/path_x11.h')
-rw-r--r-- | ui/gfx/path_x11.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/gfx/path_x11.h b/ui/gfx/path_x11.h index c6e7507..5b1610e 100644 --- a/ui/gfx/path_x11.h +++ b/ui/gfx/path_x11.h @@ -11,14 +11,9 @@ #include "ui/gfx/gfx_export.h" class SkPath; -class SkRegion; namespace gfx { -// Creates a new REGION given |region|. The caller is responsible for destroying -// the returned region. -GFX_EXPORT REGION* CreateRegionFromSkRegion(const SkRegion& region); - // Creates a new REGION given |path|. The caller is responsible for destroying // the returned region. GFX_EXPORT REGION* CreateRegionFromSkPath(const SkPath& path); |