OLD | NEW |
---|---|
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 Loading... | |
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()) { | |
yosin_UTC9
2014/08/07 01:09:55
nit: We don't need to have "{}" for single line th
yoichio
2014/08/07 03:03:06
Done.
| |
1748 toLocalFrame(frame)->selection().recomputeCaretRect(); | |
1749 } | |
1745 } | 1750 } |
1746 | 1751 |
1747 void WebViewImpl::layout() | 1752 void WebViewImpl::layout() |
1748 { | 1753 { |
1749 TRACE_EVENT0("blink", "WebViewImpl::layout"); | 1754 TRACE_EVENT0("blink", "WebViewImpl::layout"); |
1750 if (!localFrameRootTemporary()) | 1755 if (!localFrameRootTemporary()) |
1751 return; | 1756 return; |
1752 | 1757 |
1753 PageWidgetDelegate::layout(m_page.get(), localFrameRootTemporary()->frame()) ; | 1758 PageWidgetDelegate::layout(m_page.get(), localFrameRootTemporary()->frame()) ; |
1754 updateLayerTreeBackgroundColor(); | 1759 updateLayerTreeBackgroundColor(); |
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4235 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); | 4240 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); |
4236 | 4241 |
4237 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4242 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4238 return false; | 4243 return false; |
4239 | 4244 |
4240 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4245 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4241 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 4246 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
4242 } | 4247 } |
4243 | 4248 |
4244 } // namespace blink | 4249 } // namespace blink |
OLD | NEW |