Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2342103002: Refactor the way PaintArtifactCompositor is attached and used. (Closed)
Patch Set: none Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 1353
1354 if (!m_layerTreeView) 1354 if (!m_layerTreeView)
1355 return; 1355 return;
1356 1356
1357 if (m_rootLayer) 1357 if (m_rootLayer)
1358 m_layerTreeView->setRootLayer(*m_rootLayer); 1358 m_layerTreeView->setRootLayer(*m_rootLayer);
1359 else 1359 else
1360 m_layerTreeView->clearRootLayer(); 1360 m_layerTreeView->clearRootLayer();
1361 } 1361 }
1362 1362
1363 void WebFrameWidgetImpl::setRootLayer(WebLayer* layer)
1364 {
1365 m_rootLayer = layer;
1366
1367 setIsAcceleratedCompositingActive(layer);
1368
1369 if (!m_layerTreeView)
1370 return;
1371
1372 if (m_rootLayer)
1373 m_layerTreeView->setRootLayer(*m_rootLayer);
1374 else
1375 m_layerTreeView->clearRootLayer();
1376 }
1377
1363 void WebFrameWidgetImpl::attachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline) 1378 void WebFrameWidgetImpl::attachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline)
1364 { 1379 {
1365 if (m_layerTreeView) 1380 if (m_layerTreeView)
1366 m_layerTreeView->attachCompositorAnimationTimeline(compositorTimeline->a nimationTimeline()); 1381 m_layerTreeView->attachCompositorAnimationTimeline(compositorTimeline->a nimationTimeline());
1367 1382
1368 } 1383 }
1369 1384
1370 void WebFrameWidgetImpl::detachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline) 1385 void WebFrameWidgetImpl::detachCompositorAnimationTimeline(CompositorAnimationTi meline* compositorTimeline)
1371 { 1386 {
1372 if (m_layerTreeView) 1387 if (m_layerTreeView)
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 } 1493 }
1479 1494
1480 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const 1495 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const
1481 { 1496 {
1482 if (!m_imeAcceptEvents) 1497 if (!m_imeAcceptEvents)
1483 return nullptr; 1498 return nullptr;
1484 return focusedLocalFrameInWidget(); 1499 return focusedLocalFrameInWidget();
1485 } 1500 }
1486 1501
1487 } // namespace blink 1502 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('k') | third_party/WebKit/Source/web/WebViewFrameWidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698