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

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

Issue 1420913008: CC AnimationHost: Fix ProgrammaticScrollAnimator detach scope. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 2667 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 return m_rootLayer; 2678 return m_rootLayer;
2679 } 2679 }
2680 2680
2681 void WebViewImpl::willCloseLayerTreeView() 2681 void WebViewImpl::willCloseLayerTreeView()
2682 { 2682 {
2683 if (m_linkHighlightsTimeline) { 2683 if (m_linkHighlightsTimeline) {
2684 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get()); 2684 detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
2685 m_linkHighlightsTimeline.clear(); 2685 m_linkHighlightsTimeline.clear();
2686 } 2686 }
2687 2687
2688 if (page())
2689 page()->willCloseLayerTreeView();
2690
2688 setRootGraphicsLayer(nullptr); 2691 setRootGraphicsLayer(nullptr);
2689 m_layerTreeView = nullptr; 2692 m_layerTreeView = nullptr;
2690 } 2693 }
2691 2694
2692 void WebViewImpl::didAcquirePointerLock() 2695 void WebViewImpl::didAcquirePointerLock()
2693 { 2696 {
2694 if (page()) 2697 if (page())
2695 page()->pointerLockController().didAcquirePointerLock(); 2698 page()->pointerLockController().didAcquirePointerLock();
2696 } 2699 }
2697 2700
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
4463 if (m_pageColorOverlay) 4466 if (m_pageColorOverlay)
4464 m_pageColorOverlay->update(); 4467 m_pageColorOverlay->update();
4465 if (InspectorOverlay* overlay = inspectorOverlay()) { 4468 if (InspectorOverlay* overlay = inspectorOverlay()) {
4466 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4469 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4467 if (inspectorPageOverlay) 4470 if (inspectorPageOverlay)
4468 inspectorPageOverlay->update(); 4471 inspectorPageOverlay->update();
4469 } 4472 }
4470 } 4473 }
4471 4474
4472 } // namespace blink 4475 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698