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

Side by Side Diff: chrome/browser/android/vr_shell/textures/insecure_content_permanent_texture.cc

Issue 2834543006: Hook up insecure content warnings for http webVR presentation. (Closed)
Patch Set: rebase Created 3 years, 8 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/android/vr_shell/textures/insecure_content_permanent_te xture.h" 5 #include "chrome/browser/android/vr_shell/textures/insecure_content_permanent_te xture.h"
6 6
7 #include "cc/paint/skia_paint_canvas.h" 7 #include "cc/paint/skia_paint_canvas.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 11 matching lines...) Expand all
22 const SkColor kBackgroundColor = SK_ColorWHITE; 22 const SkColor kBackgroundColor = SK_ColorWHITE;
23 const SkColor kForegroundColor = 0xFF444444; 23 const SkColor kForegroundColor = 0xFF444444;
24 constexpr float kBorderFactor = 0.1; 24 constexpr float kBorderFactor = 0.1;
25 constexpr float kIconSizeFactor = 0.7; 25 constexpr float kIconSizeFactor = 0.7;
26 constexpr float kFontSizeFactor = 0.45; 26 constexpr float kFontSizeFactor = 0.45;
27 constexpr float kTextHeightFactor = 1.0 - 2 * kBorderFactor; 27 constexpr float kTextHeightFactor = 1.0 - 2 * kBorderFactor;
28 constexpr float kTextWidthFactor = 4.0 - 3 * kBorderFactor - kIconSizeFactor; 28 constexpr float kTextWidthFactor = 4.0 - 3 * kBorderFactor - kIconSizeFactor;
29 29
30 } // namespace 30 } // namespace
31 31
32 InsecureContentPermanentTexture::InsecureContentPermanentTexture( 32 InsecureContentPermanentTexture::InsecureContentPermanentTexture() = default;
33 int texture_handle,
34 int texture_size)
35 : UITexture(texture_handle, texture_size) {
36 // Ensuring height is a quarter of the width.
37 DCHECK(texture_size_ % 4 == 0);
38 height_ = texture_size_ / 4;
39 }
40 33
41 InsecureContentPermanentTexture::~InsecureContentPermanentTexture() = default; 34 InsecureContentPermanentTexture::~InsecureContentPermanentTexture() = default;
42 35
43 void InsecureContentPermanentTexture::Draw(gfx::Canvas* canvas) { 36 void InsecureContentPermanentTexture::Draw(gfx::Canvas* canvas,
37 const gfx::Size& texture_size) {
38 DCHECK(texture_size.height() * 4 == texture_size.width());
39 size_.set_height(texture_size.height());
40 int max_width = texture_size.width();
44 cc::PaintFlags flags; 41 cc::PaintFlags flags;
45 flags.setColor(kBackgroundColor); 42 flags.setColor(kBackgroundColor);
46 43
47 int text_flags = gfx::Canvas::TEXT_ALIGN_CENTER | gfx::Canvas::NO_ELLIPSIS; 44 int text_flags = gfx::Canvas::TEXT_ALIGN_CENTER | gfx::Canvas::NO_ELLIPSIS;
48 auto text = 45 auto text =
49 l10n_util::GetStringUTF16(IDS_PAGE_INFO_INSECURE_WEBVR_CONTENT_PERMANENT); 46 l10n_util::GetStringUTF16(IDS_PAGE_INFO_INSECURE_WEBVR_CONTENT_PERMANENT);
50 auto fonts = GetFontList(height_ * kFontSizeFactor, text); 47 auto fonts = GetFontList(size_.height() * kFontSizeFactor, text);
51 int text_height = kTextHeightFactor * height_; 48 int text_height = kTextHeightFactor * size_.height();
52 int text_width = kTextWidthFactor * height_; 49 int text_width = kTextWidthFactor * size_.height();
53 gfx::Canvas::SizeStringInt(text, fonts, &text_width, &text_height, 0, 50 gfx::Canvas::SizeStringInt(text, fonts, &text_width, &text_height, 0,
54 text_flags); 51 text_flags);
55 // Giving some extra width without reaching the texture limit. 52 // Giving some extra width without reaching the texture limit.
56 text_width = static_cast<int>(std::min( 53 text_width =
57 text_width + 2 * kBorderFactor * height_, kTextWidthFactor * height_)); 54 static_cast<int>(std::min(text_width + 2 * kBorderFactor * size_.height(),
58 width_ = static_cast<int>( 55 kTextWidthFactor * size_.height()));
59 ceil((3 * kBorderFactor + kIconSizeFactor) * height_ + text_width)); 56 size_.set_width((3 * kBorderFactor + kIconSizeFactor) * size_.height() +
60 57 text_width);
61 canvas->DrawRoundRect(gfx::Rect(width_, height_), height_ * kBorderFactor, 58 DCHECK_LE(size_.width(), max_width);
62 flags); 59 canvas->DrawRoundRect(gfx::Rect(size_.width(), size_.height()),
60 size_.height() * kBorderFactor, flags);
63 61
64 canvas->Save(); 62 canvas->Save();
65 canvas->Translate({IsRTL() ? 2 * kBorderFactor * height_ + text_width 63 canvas->Translate(
66 : height_ * kBorderFactor, 64 gfx::Vector2d(IsRTL() ? 2 * kBorderFactor * size_.height() + text_width
67 height_ * (1.0 - kIconSizeFactor) / 2.0}); 65 : size_.height() * kBorderFactor,
68 PaintVectorIcon(canvas, ui::kInfoOutlineIcon, height_ * kIconSizeFactor, 66 size_.height() * (1.0 - kIconSizeFactor) / 2.0));
69 kForegroundColor); 67 PaintVectorIcon(canvas, ui::kInfoOutlineIcon,
68 size_.height() * kIconSizeFactor, kForegroundColor);
70 canvas->Restore(); 69 canvas->Restore();
71 70
72 canvas->Save(); 71 canvas->Save();
73 canvas->Translate({height_ * (IsRTL() ? kBorderFactor 72 canvas->Translate(gfx::Vector2d(
74 : 2 * kBorderFactor + kIconSizeFactor), 73 size_.height() *
75 height_ * kBorderFactor}); 74 (IsRTL() ? kBorderFactor : 2 * kBorderFactor + kIconSizeFactor),
75 size_.height() * kBorderFactor));
76 canvas->DrawStringRectWithFlags( 76 canvas->DrawStringRectWithFlags(
77 text, fonts, kForegroundColor, 77 text, fonts, kForegroundColor,
78 gfx::Rect(text_width, kTextHeightFactor * height_), text_flags); 78 gfx::Rect(text_width, kTextHeightFactor * size_.height()), text_flags);
79 canvas->Restore(); 79 canvas->Restore();
80 } 80 }
81 81
82 void InsecureContentPermanentTexture::SetSize() { 82 gfx::Size InsecureContentPermanentTexture::GetPreferredTextureSize(
83 size_.SetSize(width_, height_); 83 int maximum_width) const {
84 // Ensuring height is a quarter of the width.
85 int height = maximum_width / 4;
86 return gfx::Size(height * 4, height);
87 }
88
89 gfx::SizeF InsecureContentPermanentTexture::GetDrawnSize() const {
90 return size_;
84 } 91 }
85 92
86 } // namespace vr_shell 93 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698