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

Side by Side Diff: ui/views/controls/image_view.cc

Issue 286903022: Revert of Remove override of View::HitTestRect() from ImageView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/image_view.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/image_view.h" 5 #include "ui/views/controls/image_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "third_party/skia/include/core/SkPaint.h" 9 #include "third_party/skia/include/core/SkPaint.h"
10 #include "ui/accessibility/ax_view_state.h" 10 #include "ui/accessibility/ax_view_state.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 bool ImageView::GetTooltipText(const gfx::Point& p, 199 bool ImageView::GetTooltipText(const gfx::Point& p,
200 base::string16* tooltip) const { 200 base::string16* tooltip) const {
201 if (tooltip_text_.empty()) 201 if (tooltip_text_.empty())
202 return false; 202 return false;
203 203
204 *tooltip = GetTooltipText(); 204 *tooltip = GetTooltipText();
205 return true; 205 return true;
206 } 206 }
207 207
208 bool ImageView::CanAcceptEvent(const ui::Event& event) { 208 bool ImageView::HitTestRect(const gfx::Rect& rect) const {
209 return interactive_ && View::CanAcceptEvent(event); 209 return interactive_ ? View::HitTestRect(rect) : false;
210 } 210 }
211 211
212
212 void ImageView::OnPaintImage(gfx::Canvas* canvas) { 213 void ImageView::OnPaintImage(gfx::Canvas* canvas) {
213 last_paint_scale_ = canvas->image_scale(); 214 last_paint_scale_ = canvas->image_scale();
214 last_painted_bitmap_pixels_ = NULL; 215 last_painted_bitmap_pixels_ = NULL;
215 216
216 if (image_.isNull()) 217 if (image_.isNull())
217 return; 218 return;
218 219
219 gfx::Rect image_bounds(GetImageBounds()); 220 gfx::Rect image_bounds(GetImageBounds());
220 if (image_bounds.IsEmpty()) 221 if (image_bounds.IsEmpty())
221 return; 222 return;
222 223
223 if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) { 224 if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
224 // Resize case 225 // Resize case
225 SkPaint paint; 226 SkPaint paint;
226 paint.setFilterLevel(SkPaint::kLow_FilterLevel); 227 paint.setFilterLevel(SkPaint::kLow_FilterLevel);
227 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(), 228 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
228 image_bounds.x(), image_bounds.y(), image_bounds.width(), 229 image_bounds.x(), image_bounds.y(), image_bounds.width(),
229 image_bounds.height(), true, paint); 230 image_bounds.height(), true, paint);
230 } else { 231 } else {
231 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y()); 232 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
232 } 233 }
233 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_); 234 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
234 } 235 }
235 236
236 } // namespace views 237 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/image_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698