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

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

Issue 431983005: FrameSelection::updateApperance for caret should not cause layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 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
« no previous file with comments | « Source/core/html/HTMLTextFormControlElementTest.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 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 1735
1736 if (!m_page) 1736 if (!m_page)
1737 return; 1737 return;
1738 1738
1739 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime); 1739 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime);
1740 1740
1741 if (m_continuousPaintingEnabled) { 1741 if (m_continuousPaintingEnabled) {
1742 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO verlays.get()); 1742 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO verlays.get());
1743 m_client->scheduleAnimation(); 1743 m_client->scheduleAnimation();
1744 } 1744 }
1745
1746 const Frame* frame = focusedWebCoreFrame();
1747 if (frame && frame->isLocalFrame())
1748 toLocalFrame(frame)->selection().recomputeCaretRect();
abarth-chromium 2014/08/09 19:05:09 This is much too early. What if the GraphicsLayer
1745 } 1749 }
1746 1750
1747 void WebViewImpl::layout() 1751 void WebViewImpl::layout()
1748 { 1752 {
1749 TRACE_EVENT0("blink", "WebViewImpl::layout"); 1753 TRACE_EVENT0("blink", "WebViewImpl::layout");
1750 if (!localFrameRootTemporary()) 1754 if (!localFrameRootTemporary())
1751 return; 1755 return;
1752 1756
1753 PageWidgetDelegate::layout(m_page.get(), localFrameRootTemporary()->frame()) ; 1757 PageWidgetDelegate::layout(m_page.get(), localFrameRootTemporary()->frame()) ;
1754 updateLayerTreeBackgroundColor(); 1758 updateLayerTreeBackgroundColor();
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after
4235 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4239 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4236 4240
4237 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4241 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4238 return false; 4242 return false;
4239 4243
4240 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4244 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4241 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4245 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4242 } 4246 }
4243 4247
4244 } // namespace blink 4248 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLTextFormControlElementTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698