diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-29 18:17:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-30 08:34:04 +0000 |
| commit | 2eb1e44ebb98208ec9bd0acb0c410e95e8f253b9 (patch) | |
| tree | 7d38a31d1fc28a0b5169fdc87ac57f984c937d88 /chromium/ui | |
| parent | 1ca3e7634f3989aec9631cfbcfd5a46bde4ebf24 (diff) | |
| download | qtwebengine-chromium-2eb1e44ebb98208ec9bd0acb0c410e95e8f253b9.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.148
Also adds a few chrome constants we partly use
Change-Id: Ibba81935bb9d7bbcf3c0e16649fb4c7f8b2b4f8a
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui')
| -rw-r--r-- | chromium/ui/arc/notification/arc_custom_notification_view.cc | 8 | ||||
| -rw-r--r-- | chromium/ui/gl/gl_image_ozone_native_pixmap.cc | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chromium/ui/arc/notification/arc_custom_notification_view.cc b/chromium/ui/arc/notification/arc_custom_notification_view.cc index 8e0c9c9068d..c07204509d2 100644 --- a/chromium/ui/arc/notification/arc_custom_notification_view.cc +++ b/chromium/ui/arc/notification/arc_custom_notification_view.cc @@ -186,6 +186,9 @@ void ArcCustomNotificationView::SetSurface(exo::NotificationSurface* surface) { if (surface_ == surface) return; + // Reset |floating_close_button_widget_| when |surface_| is changed. + floating_close_button_widget_.reset(); + if (surface_ && surface_->window()) { surface_->window()->RemoveObserver(this); surface_->window()->RemovePreTargetHandler(event_forwarder_.get()); @@ -200,7 +203,8 @@ void ArcCustomNotificationView::SetSurface(exo::NotificationSurface* surface) { if (GetWidget()) AttachSurface(); - UpdatePinnedState(); + if (item_) + UpdatePinnedState(); } } @@ -238,6 +242,8 @@ void ArcCustomNotificationView::UpdateCloseButtonVisiblity() { } void ArcCustomNotificationView::UpdatePinnedState() { + DCHECK(item_); + if (item_->pinned() && floating_close_button_widget_) { floating_close_button_widget_.reset(); } else if (!item_->pinned() && !floating_close_button_widget_) { diff --git a/chromium/ui/gl/gl_image_ozone_native_pixmap.cc b/chromium/ui/gl/gl_image_ozone_native_pixmap.cc index 207a83e2488..86e13b25b86 100644 --- a/chromium/ui/gl/gl_image_ozone_native_pixmap.cc +++ b/chromium/ui/gl/gl_image_ozone_native_pixmap.cc @@ -167,6 +167,8 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap, attrs_plane < gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat()); ++attrs_plane) { + attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + attrs_plane * 3); + size_t pixmap_plane = attrs_plane; // TODO(dcastagna): Intel mesa flips V and U when the fourcc format is a |