diff options
| author | Mattias Nissler <mnissler@chromium.org> | 2015-07-09 11:33:44 +0200 |
|---|---|---|
| committer | Mattias Nissler <mnissler@chromium.org> | 2015-07-09 09:34:56 +0000 |
| commit | 17399fb2b0a5fcba7c2dcb76ab2c597e6cf7c0db (patch) | |
| tree | cce3efd92751a740290200be1185f5b501e8e5a8 /ui/gfx/paint_vector_icon.h | |
| parent | 53e230a8e16c732966545622bd0b46b619e59ca4 (diff) | |
| download | chromium_src-17399fb2b0a5fcba7c2dcb76ab2c597e6cf7c0db.zip chromium_src-17399fb2b0a5fcba7c2dcb76ab2c597e6cf7c0db.tar.gz chromium_src-17399fb2b0a5fcba7c2dcb76ab2c597e6cf7c0db.tar.bz2 | |
Revert vector icon CLs.
This reverts the following commits:
ac1592c73bdd24eca2ea3e591e8f7b199627e6e7: "mandoline: Fix aura build for android."
5490bafef2f11416bed41ad8017a6db500c67345: "Split vector icon commands into separate files aggregated at build time."
33b823af3e63287dbe850c253ae97593411d4f43: "Introduce some util code for drawing vector assets."
Reason for revert is 33b823af3e63287dbe850c253ae97593411d4f43, which
is one of the suspects for having broken browser_tests on Mac builders:
http://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/8232
http://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/4313
Log output:
NativeAppWindowCocoaBrowserTestInstance/NativeAppWindowCocoaBrowserTest.FrameColor/0 (run #1):
[ RUN ] NativeAppWindowCocoaBrowserTestInstance/NativeAppWindowCocoaBrowserTest.FrameColor/0
[7393:1287:0708/150523:WARNING:vt_video_decode_accelerator.cc(206)] Failed to create hardware VideoToolbox session. Hardware accelerated video decoding will be disabled.
[7390:45827:0708/150524:WARNING:data_reduction_proxy_config.cc(630)] SPDY proxy OFF at startup
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:645: Failure
Value of: [color redComponent]
Actual: 0.952941
Expected: 0
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:646: Failure
Value of: [color greenComponent]
Actual: 0.952941
Expected: 0
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:647: Failure
Value of: [color blueComponent]
Actual: 0.952941
Expected: 1
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:654: Failure
Value of: [color redComponent]
Actual: 0.952941
Expected: 1
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:655: Failure
Value of: [color greenComponent]
Actual: 0.952941
Expected: 0
../../chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm:656: Failure
Value of: [color blueComponent]
Actual: 0.952941
Expected: 0
[ FAILED ] NativeAppWindowCocoaBrowserTestInstance/NativeAppWindowCocoaBrowserTest.FrameColor/0, where GetParam() = false (1817 ms)
BUG=508389
TBR=estade@chromium.org
Review URL: https://codereview.chromium.org/1228923002 .
Cr-Commit-Position: refs/heads/master@{#338004}
Diffstat (limited to 'ui/gfx/paint_vector_icon.h')
| -rw-r--r-- | ui/gfx/paint_vector_icon.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/ui/gfx/paint_vector_icon.h b/ui/gfx/paint_vector_icon.h deleted file mode 100644 index de2fb22..0000000 --- a/ui/gfx/paint_vector_icon.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2015 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 UI_GFX_PAINT_VECTOR_ICON_H_ -#define UI_GFX_PAINT_VECTOR_ICON_H_ - -#include "base/basictypes.h" -#include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/gfx_export.h" - -namespace gfx { - -class Canvas; -enum class VectorIconId; - -// Draws a vector icon identified by |id| onto |canvas| at (0, 0). |dip_size| -// is the length of a single edge of the square icon, in device independent -// pixels. |color| is used as the fill. -GFX_EXPORT void PaintVectorIcon(Canvas* canvas, - VectorIconId id, - size_t dip_size, - SkColor color); - -} // namespace gfx - -#endif // UI_GFX_PAINT_VECTOR_ICON_H_ |