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