Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 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 586 matching lines @@
     }
 }
 
 bool WebFrameWidgetImpl::isAcceleratedCompositingActive() const
 {
     return m_isAcceleratedCompositingActive;
 }
 
 void WebFrameWidgetImpl::willCloseLayerTreeView()
 {
+    if (page() && m_layerTreeView)

[dcheng, 2015/12/01 01:16:30]

Out of curiosity... how can we have a null page here? Can this get called on an
already detached frame?

[loyso (OOO), 2015/12/01 05:41:03]

There is a comment:
    // Returns the page object associated with this widget. This may be null
when
    // the page is shutting down, but will be valid at all other times.
    Page* page() const { return view()->page(); }
It's not completely clear, what the "shutting down" scope means.

But anyway, the lifetime scope for m_layerTreeView must be within the case when
frame is attached.

Fixed.

[loyso (OOO), 2015/12/01 06:45:39]

Well, we have it null here in fast/forms/ layout tests (see failed
webkit_tests).
It's called from RenderWidget::DoDeferredClose.

+        page()->willCloseLayerTreeView(*m_layerTreeView);
+
     setIsAcceleratedCompositingActive(false);
     m_layerTreeView = nullptr;
     m_layerTreeViewClosed = true;
 }
 
 void WebFrameWidgetImpl::didChangeWindowResizerRect()
 {
     if (m_localRoot->frameView())
         m_localRoot->frameView()->windowResizerRectChanged();
 }
@@ skipping 354 matching lines @@
 {
     if (m_client) {
         m_client->initializeLayerTreeView();
         m_layerTreeView = m_client->layerTreeView();
     }
 
     if (WebDevToolsAgentImpl* devTools = m_localRoot->devToolsAgentImpl())
         devTools->layerTreeViewChanged(m_layerTreeView);
 
     page()->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
+    if (m_layerTreeView)
+        page()->layerTreeViewInitialized(*m_layerTreeView);
 
     // FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)
     // make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.
     ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeView());
 }
 
 void WebFrameWidgetImpl::setIsAcceleratedCompositingActive(bool active)
 {
     // In the middle of shutting down; don't try to spin back up a compositor.
     // FIXME: compositing startup/shutdown should be refactored so that it
@@ skipping 78 matching lines @@
 
 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& posInRootFrame)
 {
     IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRootFrame));
     HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtPoint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
     result.setToShadowHostIfInUserAgentShadowRoot();
     return result;
 }
 
 } // namespace blink