| 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 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1762 { | 1762 { |
| 1763 ASSERT(isAcceleratedCompositingActive()); | 1763 ASSERT(isAcceleratedCompositingActive()); |
| 1764 m_layerTreeView->compositeAndReadbackAsync(callback); | 1764 m_layerTreeView->compositeAndReadbackAsync(callback); |
| 1765 } | 1765 } |
| 1766 | 1766 |
| 1767 bool WebViewImpl::isTrackingRepaints() const | 1767 bool WebViewImpl::isTrackingRepaints() const |
| 1768 { | 1768 { |
| 1769 if (!page()) | 1769 if (!page()) |
| 1770 return false; | 1770 return false; |
| 1771 FrameView* view = page()->mainFrame()->view(); | 1771 FrameView* view = page()->mainFrame()->view(); |
| 1772 return view->isTrackingRepaints(); | 1772 return view->isTrackingPaintInvalidations(); |
| 1773 } | 1773 } |
| 1774 | 1774 |
| 1775 void WebViewImpl::themeChanged() | 1775 void WebViewImpl::themeChanged() |
| 1776 { | 1776 { |
| 1777 if (!page()) | 1777 if (!page()) |
| 1778 return; | 1778 return; |
| 1779 FrameView* view = page()->mainFrame()->view(); | 1779 FrameView* view = page()->mainFrame()->view(); |
| 1780 | 1780 |
| 1781 WebRect damagedRect(0, 0, m_size.width, m_size.height); | 1781 WebRect damagedRect(0, 0, m_size.width, m_size.height); |
| 1782 view->invalidateRect(damagedRect); | 1782 view->invalidateRect(damagedRect); |
| (...skipping 2268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4051 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4051 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4052 | 4052 |
| 4053 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4053 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4054 return false; | 4054 return false; |
| 4055 | 4055 |
| 4056 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4056 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4057 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4057 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4058 } | 4058 } |
| 4059 | 4059 |
| 4060 } // namespace blink | 4060 } // namespace blink |
| OLD | NEW |