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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2702153003: [content] Fix background color update handling in RWHVAura. (Closed)
Patch Set: rebase: employ same mechanism in RWHVMac. 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 (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 "content/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 latest_confirmed_begin_frame_source_id_(0), 445 latest_confirmed_begin_frame_source_id_(0),
446 latest_confirmed_begin_frame_sequence_number_( 446 latest_confirmed_begin_frame_sequence_number_(
447 cc::BeginFrameArgs::kInvalidFrameNumber), 447 cc::BeginFrameArgs::kInvalidFrameNumber),
448 outstanding_begin_frame_requests_(0), 448 outstanding_begin_frame_requests_(0),
449 is_showing_(!widget_host->is_hidden()), 449 is_showing_(!widget_host->is_hidden()),
450 is_window_visible_(true), 450 is_window_visible_(true),
451 is_window_activity_started_(true), 451 is_window_activity_started_(true),
452 is_in_vr_(false), 452 is_in_vr_(false),
453 content_view_core_(nullptr), 453 content_view_core_(nullptr),
454 ime_adapter_android_(nullptr), 454 ime_adapter_android_(nullptr),
455 background_color_(SK_ColorWHITE),
455 cached_background_color_(SK_ColorWHITE), 456 cached_background_color_(SK_ColorWHITE),
456 view_(this), 457 view_(this),
457 gesture_provider_(ui::GetGestureProviderConfig( 458 gesture_provider_(ui::GetGestureProviderConfig(
458 ui::GestureProviderConfigType::CURRENT_PLATFORM), 459 ui::GestureProviderConfigType::CURRENT_PLATFORM),
459 this), 460 this),
460 stylus_text_selector_(this), 461 stylus_text_selector_(this),
461 using_browser_compositor_(CompositorImpl::IsInitialized()), 462 using_browser_compositor_(CompositorImpl::IsInitialized()),
462 synchronous_compositor_client_(nullptr), 463 synchronous_compositor_client_(nullptr),
463 frame_evictor_(new DelegatedFrameEvictor(this)), 464 frame_evictor_(new DelegatedFrameEvictor(this)),
464 observing_root_window_(false), 465 observing_root_window_(false),
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 1032
1032 delete this; 1033 delete this;
1033 } 1034 }
1034 1035
1035 void RenderWidgetHostViewAndroid::SetTooltipText( 1036 void RenderWidgetHostViewAndroid::SetTooltipText(
1036 const base::string16& tooltip_text) { 1037 const base::string16& tooltip_text) {
1037 // Tooltips don't makes sense on Android. 1038 // Tooltips don't makes sense on Android.
1038 } 1039 }
1039 1040
1040 void RenderWidgetHostViewAndroid::SetBackgroundColor(SkColor color) { 1041 void RenderWidgetHostViewAndroid::SetBackgroundColor(SkColor color) {
1041 RenderWidgetHostViewBase::SetBackgroundColor(color); 1042 background_color_ = color;
1042 host_->SetBackgroundOpaque(GetBackgroundOpaque()); 1043
1044 DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
1045 SkColorGetA(color) == SK_AlphaTRANSPARENT);
1046 host_->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
1043 UpdateBackgroundColor(color); 1047 UpdateBackgroundColor(color);
1044 } 1048 }
1045 1049
1050 SkColor RenderWidgetHostViewAndroid::background_color() const {
1051 return background_color_;
1052 }
1053
1046 void RenderWidgetHostViewAndroid::CopyFromSurface( 1054 void RenderWidgetHostViewAndroid::CopyFromSurface(
1047 const gfx::Rect& src_subrect, 1055 const gfx::Rect& src_subrect,
1048 const gfx::Size& dst_size, 1056 const gfx::Size& dst_size,
1049 const ReadbackRequestCallback& callback, 1057 const ReadbackRequestCallback& callback,
1050 const SkColorType preferred_color_type) { 1058 const SkColorType preferred_color_type) {
1051 TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::CopyFromSurface"); 1059 TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::CopyFromSurface");
1052 if (!host_ || !IsSurfaceAvailableForCopy()) { 1060 if (!host_ || !IsSurfaceAvailableForCopy()) {
1053 callback.Run(SkBitmap(), READBACK_SURFACE_UNAVAILABLE); 1061 callback.Run(SkBitmap(), READBACK_SURFACE_UNAVAILABLE);
1054 return; 1062 return;
1055 } 1063 }
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 2183
2176 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); 2184 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
2177 if (!compositor) 2185 if (!compositor)
2178 return; 2186 return;
2179 2187
2180 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( 2188 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
2181 overscroll_refresh_handler, compositor, view_.GetDipScale()); 2189 overscroll_refresh_handler, compositor, view_.GetDipScale());
2182 } 2190 }
2183 2191
2184 } // namespace content 2192 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698