Remove layered window painting support from HWNDMessageHandler

ui/views/win/hwnd_message_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/win/hwnd_message_handler.h"
 
 #include <dwmapi.h>
 #include <oleacc.h>
 #include <shellapi.h>
 
@@ skipping 301 matching lines @@
       remove_standard_frame_(false),
       use_system_default_icon_(false),
       restored_enabled_(false),
       current_cursor_(NULL),
       previous_cursor_(NULL),
       active_mouse_tracking_flags_(0),
       is_right_mouse_pressed_on_caption_(false),
       lock_updates_count_(0),
       ignore_window_pos_changes_(false),
       last_monitor_(NULL),
-      use_layered_buffer_(false),
-      layered_alpha_(255),
-      waiting_for_redraw_layered_window_contents_(false),
       is_first_nccalc_(true),
       menu_depth_(0),
       id_generator_(0),
       needs_scroll_styles_(false),
       in_size_loop_(false),
       touch_down_contexts_(0),
       last_mouse_hwheel_time_(0),
       msg_handled_(FALSE),
       dwm_transition_desired_(false),
       autohide_factory_(this),
@@ skipping 446 matching lines @@
     delegate_->HandleFrameChanged();
     InvalidateRect(hwnd(), NULL, FALSE);
   } else {
     if (!custom_window_region_ && !delegate_->IsUsingCustomFrame())
       dwm_transition_desired_ = true;
     if (!dwm_transition_desired_ || !fullscreen_handler_->fullscreen())
       PerformDwmTransition();
   }
 }
 
-void HWNDMessageHandler::SchedulePaintInRect(const gfx::Rect& rect) {
-  if (use_layered_buffer_) {
-    // We must update the back-buffer immediately, since Windows' handling of
-    // invalid rects is somewhat mysterious.
-    invalid_rect_.Union(rect);
-
-    // In some situations, such as drag and drop, when Windows itself runs a
-    // nested message loop our message loop appears to be starved and we don't
-    // receive calls to DidProcessMessage(). This only seems to affect layered
-    // windows, so we schedule a redraw manually using a task, since those never
-    // seem to be starved. Also, wtf.
-    if (!waiting_for_redraw_layered_window_contents_) {
-      waiting_for_redraw_layered_window_contents_ = true;
-      base::MessageLoop::current()->PostTask(
-          FROM_HERE,
-          base::Bind(&HWNDMessageHandler::RedrawLayeredWindowContents,
-                     weak_factory_.GetWeakPtr()));
-    }
-  } else {
-    // InvalidateRect() expects client coordinates.
-    RECT r = rect.ToRECT();
-    InvalidateRect(hwnd(), &r, FALSE);
-  }
-}
-
-void HWNDMessageHandler::SetOpacity(BYTE opacity) {
-  layered_alpha_ = opacity;
-}
-
 void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                         const gfx::ImageSkia& app_icon) {
   if (!window_icon.isNull()) {
     HICON windows_icon = IconUtil::CreateHICONFromSkBitmap(
         *window_icon.bitmap());
     // We need to make sure to destroy the previous icon, otherwise we'll leak
     // these GDI objects until we crash!
     HICON old_icon = reinterpret_cast<HICON>(
         SendMessage(hwnd(), WM_SETICON, ICON_SMALL,
                     reinterpret_cast<LPARAM>(windows_icon)));
@@ skipping 271 matching lines @@
     TrackMouseEvent(&tme);
   } else if (mouse_tracking_flags != active_mouse_tracking_flags_) {
     TrackMouseEvents(active_mouse_tracking_flags_ | TME_CANCEL);
     TrackMouseEvents(mouse_tracking_flags);
   }
 }
 
 void HWNDMessageHandler::ClientAreaSizeChanged() {
   gfx::Size s = GetClientAreaBounds().size();
   delegate_->HandleClientSizeChanged(s);
-  if (use_layered_buffer_)
-    layered_window_contents_.reset(new gfx::Canvas(s, 1.0f, false));
 }
 
 bool HWNDMessageHandler::GetClientAreaInsets(gfx::Insets* insets) const {
   if (delegate_->GetClientAreaInsets(insets))
     return true;
   DCHECK(insets->empty());
 
   // Returning false causes the default handling in OnNCCalcSize() to
   // be invoked.
   if (!delegate_->IsWidgetWindow() ||
@@ skipping 109 matching lines @@
 }
 
 void HWNDMessageHandler::UnlockUpdates(bool force) {
   if ((force || !ui::win::IsAeroGlassEnabled()) && --lock_updates_count_ <= 0) {
     SetWindowLong(hwnd(), GWL_STYLE,
                   GetWindowLong(hwnd(), GWL_STYLE) | WS_VISIBLE);
     lock_updates_count_ = 0;
   }
 }
 
-void HWNDMessageHandler::RedrawLayeredWindowContents() {
-  waiting_for_redraw_layered_window_contents_ = false;
-  if (invalid_rect_.IsEmpty())
-    return;
-
-  // We need to clip to the dirty rect ourselves.
-  layered_window_contents_->sk_canvas()->save();
-  double scale = gfx::GetDPIScale();
-  layered_window_contents_->sk_canvas()->scale(
-      SkScalar(scale),SkScalar(scale));
-  layered_window_contents_->ClipRect(invalid_rect_);
-  delegate_->PaintLayeredWindow(layered_window_contents_.get());
-  layered_window_contents_->sk_canvas()->scale(
-      SkScalar(1.0/scale),SkScalar(1.0/scale));
-  layered_window_contents_->sk_canvas()->restore();
-
-  RECT wr;
-  GetWindowRect(hwnd(), &wr);
-  SIZE size = {wr.right - wr.left, wr.bottom - wr.top};
-  POINT position = {wr.left, wr.top};
-  HDC dib_dc = skia::BeginPlatformPaint(layered_window_contents_->sk_canvas());
-  POINT zero = {0, 0};
-  BLENDFUNCTION blend = {AC_SRC_OVER, 0, layered_alpha_, AC_SRC_ALPHA};
-  UpdateLayeredWindow(hwnd(), NULL, &position, &size, dib_dc, &zero,
-                      RGB(0xFF, 0xFF, 0xFF), &blend, ULW_ALPHA);
-  invalid_rect_.SetRect(0, 0, 0, 0);
-  skia::EndPlatformPaint(layered_window_contents_->sk_canvas());
-}
-
 void HWNDMessageHandler::ForceRedrawWindow(int attempts) {
   if (ui::IsWorkstationLocked()) {
     // Presents will continue to fail as long as the input desktop is
     // unavailable.
     if (--attempts <= 0)
       return;
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&HWNDMessageHandler::ForceRedrawWindow,
                    weak_factory_.GetWeakPtr(),
@@ skipping 77 matching lines @@
   // should ignore it.
   if (notification_code > 1 || delegate_->HandleAppCommand(command))
     SetMsgHandled(FALSE);
 }
 
 LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 HWNDMessageHandler::OnCreate1"));
 
-  use_layered_buffer_ = !!(window_ex_style() & WS_EX_LAYERED);
-
   if (window_ex_style() &  WS_EX_COMPOSITED) {
     // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
     tracked_objects::ScopedTracker tracking_profile2(
         FROM_HERE_WITH_EXPLICIT_FUNCTION(
             "440919 HWNDMessageHandler::OnCreate2"));
 
     if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
       // This is part of the magic to emulate layered windows with Aura
       // see the explanation elsewere when we set WS_EX_COMPOSITED style.
       MARGINS margins = {-1,-1,-1,-1};
@@ skipping 667 matching lines @@
   } else {
     RECT rgn_bounding_box;
     GetRgnBox(rgn, &rgn_bounding_box);
     if (!IntersectRect(&dirty_region, &rgn_bounding_box, &window_rect))
       return;  // Dirty region doesn't intersect window bounds, bale.
 
     // rgn_bounding_box is in screen coordinates. Map it to window coordinates.
     OffsetRect(&dirty_region, -window_rect.left, -window_rect.top);
   }
 
-  gfx::Rect old_paint_region = invalid_rect_;
-  if (!old_paint_region.IsEmpty()) {
-    // The root view has a region that needs to be painted. Include it in the
-    // region we're going to paint.
-
-    RECT old_paint_region_crect = old_paint_region.ToRECT();
-    RECT tmp = dirty_region;
-    UnionRect(&dirty_region, &tmp, &old_paint_region_crect);
-  }
-
-  SchedulePaintInRect(gfx::Rect(dirty_region));
   delegate_->HandlePaintAccelerated(gfx::Rect(dirty_region));
 
   // When using a custom frame, we want to avoid calling DefWindowProc() since
   // that may render artifacts.
   SetMsgHandled(delegate_->IsUsingCustomFrame());
 }
 
 LRESULT HWNDMessageHandler::OnNCUAHDrawCaption(UINT message,
                                                WPARAM w_param,
                                                LPARAM l_param) {
@@ skipping 730 matching lines @@
     SetWindowPos(hwnd(), NULL, 0, 0, 0, 0, flags | SWP_HIDEWINDOW);
     SetWindowPos(hwnd(), NULL, 0, 0, 0, 0, flags | SWP_SHOWWINDOW);
   }
   // WM_DWMCOMPOSITIONCHANGED is only sent to top level windows, however we want
   // to notify our children too, since we can have MDI child windows who need to
   // update their appearance.
   EnumChildWindows(hwnd(), &SendDwmCompositionChanged, NULL);
 }
 
 }  // namespace views