| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 return document->focusedElement(); | 937 return document->focusedElement(); |
| 938 } | 938 } |
| 939 | 939 |
| 940 void WebFrameWidgetImpl::initializeLayerTreeView() | 940 void WebFrameWidgetImpl::initializeLayerTreeView() |
| 941 { | 941 { |
| 942 if (m_client) { | 942 if (m_client) { |
| 943 m_client->initializeLayerTreeView(); | 943 m_client->initializeLayerTreeView(); |
| 944 m_layerTreeView = m_client->layerTreeView(); | 944 m_layerTreeView = m_client->layerTreeView(); |
| 945 } | 945 } |
| 946 | 946 |
| 947 if (WebDevToolsAgentImpl* devTools = m_localRoot->devToolsAgentImpl()) |
| 948 devTools->layerTreeViewChanged(m_layerTreeView); |
| 949 |
| 947 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView); | 950 m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView); |
| 948 | 951 |
| 949 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) | 952 // FIXME: only unittests, click to play, Android priting, and printing (for
headers and footers) |
| 950 // make this assert necessary. We should make them not hit this code and the
n delete allowsBrokenNullLayerTreeView. | 953 // make this assert necessary. We should make them not hit this code and the
n delete allowsBrokenNullLayerTreeView. |
| 951 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi
ew()); | 954 ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeVi
ew()); |
| 952 } | 955 } |
| 953 | 956 |
| 954 void WebFrameWidgetImpl::setIsAcceleratedCompositingActive(bool active) | 957 void WebFrameWidgetImpl::setIsAcceleratedCompositingActive(bool active) |
| 955 { | 958 { |
| 956 // In the middle of shutting down; don't try to spin back up a compositor. | 959 // In the middle of shutting down; don't try to spin back up a compositor. |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 // correspond to Page visibility, but is necessary until we properly sort ou
t OOPIF visibility. | 1050 // correspond to Page visibility, but is necessary until we properly sort ou
t OOPIF visibility. |
| 1048 m_page->setVisibilityState(static_cast<PageVisibilityState>(visibilityState)
, isInitialState); | 1051 m_page->setVisibilityState(static_cast<PageVisibilityState>(visibilityState)
, isInitialState); |
| 1049 | 1052 |
| 1050 if (m_layerTreeView) { | 1053 if (m_layerTreeView) { |
| 1051 bool visible = visibilityState == WebPageVisibilityStateVisible; | 1054 bool visible = visibilityState == WebPageVisibilityStateVisible; |
| 1052 m_layerTreeView->setVisible(visible); | 1055 m_layerTreeView->setVisible(visible); |
| 1053 } | 1056 } |
| 1054 } | 1057 } |
| 1055 | 1058 |
| 1056 } // namespace blink | 1059 } // namespace blink |
| OLD | NEW |