| 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 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1907 // FIXME: This should probably be using the local root? | 1907 // FIXME: This should probably be using the local root? |
| 1908 if (m_page->mainFrame()->isLocalFrame()) | 1908 if (m_page->mainFrame()->isLocalFrame()) |
| 1909 PageWidgetDelegate::animate(*m_page, validFrameTime.lastFrameTimeMonoton
ic, *m_page->deprecatedLocalMainFrame()); | 1909 PageWidgetDelegate::animate(*m_page, validFrameTime.lastFrameTimeMonoton
ic, *m_page->deprecatedLocalMainFrame()); |
| 1910 | 1910 |
| 1911 if (m_continuousPaintingEnabled) { | 1911 if (m_continuousPaintingEnabled) { |
| 1912 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO
verlays.get()); | 1912 ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageO
verlays.get()); |
| 1913 m_client->scheduleAnimation(); | 1913 m_client->scheduleAnimation(); |
| 1914 } | 1914 } |
| 1915 } | 1915 } |
| 1916 | 1916 |
| 1917 void WebViewImpl::setNeedsLayoutAndFullPaintInvalidation() |
| 1918 { |
| 1919 if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame
()->view()) |
| 1920 return; |
| 1921 |
| 1922 FrameView* view = mainFrameImpl()->frame()->view(); |
| 1923 view->setNeedsLayout(); |
| 1924 view->setNeedsFullPaintInvalidation(); |
| 1925 } |
| 1926 |
| 1917 void WebViewImpl::layout() | 1927 void WebViewImpl::layout() |
| 1918 { | 1928 { |
| 1919 TRACE_EVENT0("blink", "WebViewImpl::layout"); | 1929 TRACE_EVENT0("blink", "WebViewImpl::layout"); |
| 1920 if (!mainFrameImpl()) | 1930 if (!mainFrameImpl()) |
| 1921 return; | 1931 return; |
| 1922 | 1932 |
| 1923 PageWidgetDelegate::layout(*m_page, *mainFrameImpl()->frame()); | 1933 PageWidgetDelegate::layout(*m_page, *mainFrameImpl()->frame()); |
| 1924 updateLayerTreeBackgroundColor(); | 1934 updateLayerTreeBackgroundColor(); |
| 1925 | 1935 |
| 1926 for (size_t i = 0; i < m_linkHighlights.size(); ++i) | 1936 for (size_t i = 0; i < m_linkHighlights.size(); ++i) |
| (...skipping 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4513 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4523 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4514 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4524 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4515 } | 4525 } |
| 4516 | 4526 |
| 4517 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4527 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4518 { | 4528 { |
| 4519 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4529 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4520 } | 4530 } |
| 4521 | 4531 |
| 4522 } // namespace blink | 4532 } // namespace blink |
| OLD | NEW |