| commit | 27a3f6ebf59ac176e82213393672d6cba5b1614d | [log] [tgz] |
|---|---|---|
| author | Nick Bray <ncbray@chromium.org> | Thu Jan 08 16:39:35 2015 -0800 |
| committer | Nick Bray <ncbray@chromium.org> | Thu Jan 08 16:39:35 2015 -0800 |
| tree | 91d16ef100311da305929953a8483df3c676f4fb | |
| parent | cd8cfdd947725e83334986b1bd2f0758f22d01e2 [diff] [blame] |
Roll Chrome into Mojo. This roll corresponds to: https://chromium.googlesource.com/chromium/src/+/d3cf92cac313434de99ae66f6e3e12d27ab536ef GN now requires python_binary_module to be undefined rather than an empty string. Context lines in cc_strip_video.patch changed. Minor edits were required for sky: Change to Skia header file organization. SkRect::intersect now warns if ignored. BUG=https://code.google.com/p/chromium/issues/detail?id=401761 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/839143002
diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h index 1dc99c3..2142413 100644 --- a/ui/gl/gl_image.h +++ b/ui/gl/gl_image.h
@@ -6,11 +6,11 @@ #define UI_GL_GL_IMAGE_H_ #include "base/memory/ref_counted.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/overlay_transform.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_export.h" namespace gfx {