| 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 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1043 | 1043 |
| 1044 if (!m_layerTreeView) | 1044 if (!m_layerTreeView) |
| 1045 return; | 1045 return; |
| 1046 | 1046 |
| 1047 if (m_rootLayer) | 1047 if (m_rootLayer) |
| 1048 m_layerTreeView->setRootLayer(*m_rootLayer); | 1048 m_layerTreeView->setRootLayer(*m_rootLayer); |
| 1049 else | 1049 else |
| 1050 m_layerTreeView->clearRootLayer(); | 1050 m_layerTreeView->clearRootLayer(); |
| 1051 } | 1051 } |
| 1052 | 1052 |
| 1053 void WebFrameWidgetImpl::attachCompositorAnimationTimeline(WebCompositorAnimatio
nTimeline* compositorTimeline) | 1053 void WebFrameWidgetImpl::attachCompositorAnimationTimeline(CompositorAnimationTi
meline* compositorTimeline) |
| 1054 { | 1054 { |
| 1055 if (m_layerTreeView) | 1055 if (m_layerTreeView) |
| 1056 m_layerTreeView->attachCompositorAnimationTimeline(compositorTimeline); | 1056 m_layerTreeView->attachCompositorAnimationTimeline(compositorTimeline->a
nimationTimeline()); |
| 1057 | 1057 |
| 1058 } | 1058 } |
| 1059 | 1059 |
| 1060 void WebFrameWidgetImpl::detachCompositorAnimationTimeline(WebCompositorAnimatio
nTimeline* compositorTimeline) | 1060 void WebFrameWidgetImpl::detachCompositorAnimationTimeline(CompositorAnimationTi
meline* compositorTimeline) |
| 1061 { | 1061 { |
| 1062 if (m_layerTreeView) | 1062 if (m_layerTreeView) |
| 1063 m_layerTreeView->detachCompositorAnimationTimeline(compositorTimeline); | 1063 m_layerTreeView->detachCompositorAnimationTimeline(compositorTimeline->a
nimationTimeline()); |
| 1064 } | 1064 } |
| 1065 | 1065 |
| 1066 void WebFrameWidgetImpl::setVisibilityState(WebPageVisibilityState visibilitySta
te, bool isInitialState) | 1066 void WebFrameWidgetImpl::setVisibilityState(WebPageVisibilityState visibilitySta
te, bool isInitialState) |
| 1067 { | 1067 { |
| 1068 if (!page()) | 1068 if (!page()) |
| 1069 return; | 1069 return; |
| 1070 | 1070 |
| 1071 // FIXME: This is not correct, since Show and Hide messages for a frame's Wi
dget do not necessarily | 1071 // FIXME: This is not correct, since Show and Hide messages for a frame's Wi
dget do not necessarily |
| 1072 // correspond to Page visibility, but is necessary until we properly sort ou
t OOPIF visibility. | 1072 // correspond to Page visibility, but is necessary until we properly sort ou
t OOPIF visibility. |
| 1073 page()->setVisibilityState(static_cast<PageVisibilityState>(visibilityState)
, isInitialState); | 1073 page()->setVisibilityState(static_cast<PageVisibilityState>(visibilityState)
, isInitialState); |
| 1074 | 1074 |
| 1075 m_localRoot->frame()->frameScheduler()->setPageVisible(visibilityState == We
bPageVisibilityStateVisible); | 1075 m_localRoot->frame()->frameScheduler()->setPageVisible(visibilityState == We
bPageVisibilityStateVisible); |
| 1076 | 1076 |
| 1077 if (m_layerTreeView) { | 1077 if (m_layerTreeView) { |
| 1078 bool visible = visibilityState == WebPageVisibilityStateVisible; | 1078 bool visible = visibilityState == WebPageVisibilityStateVisible; |
| 1079 m_layerTreeView->setVisible(visible); | 1079 m_layerTreeView->setVisible(visible); |
| 1080 } | 1080 } |
| 1081 } | 1081 } |
| 1082 | 1082 |
| 1083 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p
osInRootFrame) | 1083 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p
osInRootFrame) |
| 1084 { | 1084 { |
| 1085 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo
tFrame)); | 1085 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo
tFrame)); |
| 1086 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP
oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); | 1086 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP
oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); |
| 1087 result.setToShadowHostIfInUserAgentShadowRoot(); | 1087 result.setToShadowHostIfInUserAgentShadowRoot(); |
| 1088 return result; | 1088 return result; |
| 1089 } | 1089 } |
| 1090 | 1090 |
| 1091 } // namespace blink | 1091 } // namespace blink |
| OLD | NEW |