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

Side by Side Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.cc

Issue 147121: Update WebKit to 45111 and Skia to 239 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 6 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include "app/gfx/canvas_paint.h" 7 #include "app/gfx/canvas_paint.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 Animation* animation = hover_animation_.get(); 538 Animation* animation = hover_animation_.get();
539 539
540 PaintInactiveTabBackground(canvas); 540 PaintInactiveTabBackground(canvas);
541 if (animation->GetCurrentValue() > 0) { 541 if (animation->GetCurrentValue() > 0) {
542 SkRect bounds; 542 SkRect bounds;
543 bounds.set(0, 0, 543 bounds.set(0, 0,
544 SkIntToScalar(width()), SkIntToScalar(height())); 544 SkIntToScalar(width()), SkIntToScalar(height()));
545 canvas->saveLayerAlpha(&bounds, 545 canvas->saveLayerAlpha(&bounds,
546 static_cast<int>(animation->GetCurrentValue() * kHoverOpacity * 0xff), 546 static_cast<int>(animation->GetCurrentValue() * kHoverOpacity * 0xff),
547 SkCanvas::kARGB_ClipLayer_SaveFlag); 547 SkCanvas::kARGB_ClipLayer_SaveFlag);
548 canvas->drawARGB(0, 255, 255, 255, SkPorterDuff::kClear_Mode); 548 canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
549 PaintActiveTabBackground(canvas); 549 PaintActiveTabBackground(canvas);
550 canvas->restore(); 550 canvas->restore();
551 } 551 }
552 } 552 }
553 } 553 }
554 554
555 void TabRendererGtk::PaintInactiveTabBackground(gfx::Canvas* canvas) { 555 void TabRendererGtk::PaintInactiveTabBackground(gfx::Canvas* canvas) {
556 bool is_otr = data_.off_the_record; 556 bool is_otr = data_.off_the_record;
557 557
558 // The tab image needs to be lined up with the background image 558 // The tab image needs to be lined up with the background image
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont); 746 gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
747 title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 10)); 747 title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 10));
748 title_font_height_ = title_font_->height(); 748 title_font_height_ = title_font_->height();
749 749
750 InitializeLoadingAnimationData(&rb, &loading_animation_data); 750 InitializeLoadingAnimationData(&rb, &loading_animation_data);
751 751
752 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON); 752 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
753 753
754 initialized_ = true; 754 initialized_ = true;
755 } 755 }
OLDNEW
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698