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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1067 layer_tree_view_->CompositorAnimationHost()); | 1067 layer_tree_view_->CompositorAnimationHost()); |
1068 } | 1068 } |
1069 | 1069 |
1070 if (WebDevToolsAgentImpl* dev_tools = local_root_->DevToolsAgentImpl()) | 1070 if (WebDevToolsAgentImpl* dev_tools = local_root_->DevToolsAgentImpl()) |
1071 dev_tools->LayerTreeViewChanged(layer_tree_view_); | 1071 dev_tools->LayerTreeViewChanged(layer_tree_view_); |
1072 | 1072 |
1073 GetPage()->GetSettings().SetAcceleratedCompositingEnabled(layer_tree_view_); | 1073 GetPage()->GetSettings().SetAcceleratedCompositingEnabled(layer_tree_view_); |
1074 if (layer_tree_view_) { | 1074 if (layer_tree_view_) { |
1075 GetPage()->LayerTreeViewInitialized(*layer_tree_view_, | 1075 GetPage()->LayerTreeViewInitialized(*layer_tree_view_, |
1076 local_root_->GetFrame()->View()); | 1076 local_root_->GetFrame()->View()); |
| 1077 |
| 1078 // TODO(kenrb): Currently GPU rasterization is always enabled for OOPIFs. |
| 1079 // This is okay because it is only necessarily to set the trigger to false |
| 1080 // for certain cases that affect the top-level frame, but it would be better |
| 1081 // to be consistent with the top-level frame. Ideally the logic should |
| 1082 // be moved from WebViewImpl into WebFrameWidget and used for all local |
| 1083 // frame roots. https://crbug.com/712794 |
| 1084 layer_tree_view_->HeuristicsForGpuRasterizationUpdated(true); |
1077 } | 1085 } |
1078 | 1086 |
1079 // FIXME: only unittests, click to play, Android priting, and printing (for | 1087 // FIXME: only unittests, click to play, Android priting, and printing (for |
1080 // headers and footers) make this assert necessary. We should make them not | 1088 // headers and footers) make this assert necessary. We should make them not |
1081 // hit this code and then delete allowsBrokenNullLayerTreeView. | 1089 // hit this code and then delete allowsBrokenNullLayerTreeView. |
1082 DCHECK(layer_tree_view_ || client_->AllowsBrokenNullLayerTreeView()); | 1090 DCHECK(layer_tree_view_ || client_->AllowsBrokenNullLayerTreeView()); |
1083 } | 1091 } |
1084 | 1092 |
1085 void WebFrameWidgetImpl::SetIsAcceleratedCompositingActive(bool active) { | 1093 void WebFrameWidgetImpl::SetIsAcceleratedCompositingActive(bool active) { |
1086 // In the middle of shutting down; don't try to spin back up a compositor. | 1094 // In the middle of shutting down; don't try to spin back up a compositor. |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1205 return nullptr; | 1213 return nullptr; |
1206 } | 1214 } |
1207 | 1215 |
1208 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { | 1216 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { |
1209 if (!ime_accept_events_) | 1217 if (!ime_accept_events_) |
1210 return nullptr; | 1218 return nullptr; |
1211 return FocusedLocalFrameInWidget(); | 1219 return FocusedLocalFrameInWidget(); |
1212 } | 1220 } |
1213 | 1221 |
1214 } // namespace blink | 1222 } // namespace blink |
OLD | NEW |