diff options
| author | Jochen Eisinger <jochen@chromium.org> | 2016-03-04 20:12:27 +0100 |
|---|---|---|
| committer | Jochen Eisinger <jochen@chromium.org> | 2016-03-04 19:15:01 +0000 |
| commit | 89004a505ea3a9955d3a5858ecb73a4c88402e1e (patch) | |
| tree | 2530b3739483ef9a79a38465aed1e00644633df1 | |
| parent | 101ada9dd43913419b598e24f2044be2856946c3 (diff) | |
| download | chromium_src-89004a505ea3a9955d3a5858ecb73a4c88402e1e.zip chromium_src-89004a505ea3a9955d3a5858ecb73a4c88402e1e.tar.gz chromium_src-89004a505ea3a9955d3a5858ecb73a4c88402e1e.tar.bz2 | |
Protect against too small or broken icons in context menus
BUG=582839
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1657363002
Cr-Commit-Position: refs/heads/master@{#373194}
(cherry picked from commit 5004faea8f7ca69923eb95b4f738f29cd814ab6f)
Review URL: https://codereview.chromium.org/1764243002 .
Cr-Commit-Position: refs/branch-heads/2623@{#579}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | chrome/browser/renderer_context_menu/render_view_context_menu.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index efaa96a..29cff9b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -406,6 +406,10 @@ void AddIconToLastMenuItem(gfx::Image icon, ui::SimpleMenuModel* menu) { int width = icon.Width(); int height = icon.Height(); + // Don't try to scale too small icons. + if (width < 16 || height < 16) + return; + // Profile avatars are supposed to be displayed with a circular mask, so apply // one. gfx::Path circular_mask; |