Remove WebPopupMenuImpl::enterForceCompositingMode

Source/web/WebPopupMenuImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 56 matching lines @@
 {
     // Pass the WebPopupMenuImpl's self-reference to the caller.
     return adoptRef(new WebPopupMenuImpl(client)).leakRef();
 }
 
 // WebWidget ------------------------------------------------------------------
 
 WebPopupMenuImpl::WebPopupMenuImpl(WebWidgetClient* client)
     : m_client(client)
     , m_layerTreeView(0)
-    , m_isAcceleratedCompositingActive(false)
     // Set to impossible point so we always get the first mouse position.
     , m_lastMousePosition(WebPoint(-1, -1))
     , m_widget(0)
 {
 }
 
 WebPopupMenuImpl::~WebPopupMenuImpl()
 {
     if (m_widget)
         m_widget->setClient(0);
 }
 
 void WebPopupMenuImpl::willCloseLayerTreeView()
 {
-    enterForceCompositingMode(false);
     m_layerTreeView = 0;
 }
 
 void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bounds)
 {
     m_widget = widget;
     m_widget->setClient(this);
 
     if (m_client) {
         m_client->setWindowRect(bounds);
         m_client->show(WebNavigationPolicy()); // Policy is ignored.
     }
+
+    m_client->initializeLayerTreeView();
+    m_layerTreeView = m_client->layerTreeView();
+    if (m_layerTreeView) {
+        m_layerTreeView->setVisible(true);
+        m_client->didActivateCompositor();
+        m_layerTreeView->setDeviceScaleFactor(m_client->deviceScaleFactor());
+        m_rootLayer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(this));
+        m_rootLayer->layer()->setBounds(m_size);
+        m_layerTreeView->setRootLayer(*m_rootLayer->layer());
+    } else {
+        m_client->didDeactivateCompositor();
+    }
 }
 
 void WebPopupMenuImpl::handleMouseMove(const WebMouseEvent& event)
 {
     // Don't send mouse move messages if the mouse hasn't moved.
     if (event.x != m_lastMousePosition.x || event.y != m_lastMousePosition.y) {
         m_lastMousePosition = WebPoint(event.x, event.y);
         m_widget->handleMouseMoveEvent(PlatformMouseEventBuilder(m_widget, event));
 
         // We cannot call setToolTipText() in PopupContainer, because PopupContainer is in WebCore, and we cannot refer to WebKit from Webcore.
@@ skipping 82 matching lines @@
 }
 
 void WebPopupMenuImpl::animate(double)
 {
 }
 
 void WebPopupMenuImpl::layout()
 {
 }
 
-void WebPopupMenuImpl::enterForceCompositingMode(bool enter)
-{
-    // FIXME: Is this function really correct? The other overrides of this function
-    // just used to set forceCompositingMode before we removed that setting.
-    // crbug.com/378029
-    if (m_isAcceleratedCompositingActive == enter)
-        return;
-
-    if (!enter) {
-        m_isAcceleratedCompositingActive = false;
-        m_client->didDeactivateCompositor();
-    } else if (m_layerTreeView) {
-        m_isAcceleratedCompositingActive = true;
-        m_client->didActivateCompositor();
-    } else {
-        TRACE_EVENT0("webkit", "WebPopupMenuImpl::enterForceCompositingMode(true)");
-
-        m_client->initializeLayerTreeView();
-        m_layerTreeView = m_client->layerTreeView();
-        if (m_layerTreeView) {
-            m_layerTreeView->setVisible(true);
-            m_client->didActivateCompositor();
-            m_isAcceleratedCompositingActive = true;
-            m_layerTreeView->setDeviceScaleFactor(m_client->deviceScaleFactor());
-            m_rootLayer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(this));
-            m_rootLayer->layer()->setBounds(m_size);
-            m_layerTreeView->setRootLayer(*m_rootLayer->layer());
-        } else {
-            m_isAcceleratedCompositingActive = false;
-            m_client->didDeactivateCompositor();
-        }
-    }
-}
-
 void WebPopupMenuImpl::paintContents(WebCanvas* canvas, const WebRect& rect, bool, WebFloatRect&,
     WebContentLayerClient::GraphicsContextStatus contextStatus)
 {
     if (!m_widget)
         return;
 
     if (!rect.isEmpty()) {
         GraphicsContext context(canvas,
             contextStatus == WebContentLayerClient::GraphicsContextEnabled ? GraphicsContext::NothingDisabled : GraphicsContext::FullyDisabled);
         m_widget->paint(&context, rect);
@@ skipping 193 matching lines @@
     ASSERT(widget == m_widget);
     if (m_widget) {
         m_widget->setClient(0);
         m_widget = 0;
     }
     if (m_client)
         m_client->closeWidgetSoon();
 }
 
 } // namespace blink