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

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

Issue 152623002: Make StyleChange parameter explicit in setNeedsStyleRecalc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGCursorElement.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 3828 matching lines...) Expand 10 before | Expand all | Expand 10 after
3839 } 3839 }
3840 3840
3841 void WebViewImpl::didExitCompositingMode() 3841 void WebViewImpl::didExitCompositingMode()
3842 { 3842 {
3843 ASSERT(m_isAcceleratedCompositingActive); 3843 ASSERT(m_isAcceleratedCompositingActive);
3844 setIsAcceleratedCompositingActive(false); 3844 setIsAcceleratedCompositingActive(false);
3845 m_compositorCreationFailed = true; 3845 m_compositorCreationFailed = true;
3846 m_client->didInvalidateRect(IntRect(0, 0, m_size.width, m_size.height)); 3846 m_client->didInvalidateRect(IntRect(0, 0, m_size.width, m_size.height));
3847 3847
3848 // Force a style recalc to remove all the composited layers. 3848 // Force a style recalc to remove all the composited layers.
3849 m_page->mainFrame()->document()->setNeedsStyleRecalc(); 3849 m_page->mainFrame()->document()->setNeedsStyleRecalc(SubtreeStyleChange);
3850 3850
3851 if (m_pageOverlays) 3851 if (m_pageOverlays)
3852 m_pageOverlays->update(); 3852 m_pageOverlays->update();
3853 } 3853 }
3854 3854
3855 void WebViewImpl::updateLayerTreeViewport() 3855 void WebViewImpl::updateLayerTreeViewport()
3856 { 3856 {
3857 if (!page() || !m_layerTreeView) 3857 if (!page() || !m_layerTreeView)
3858 return; 3858 return;
3859 3859
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
3981 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3981 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3982 3982
3983 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3983 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3984 return false; 3984 return false;
3985 3985
3986 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3986 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3987 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3987 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3988 } 3988 }
3989 3989
3990 } // namespace blink 3990 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/SVGCursorElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698