| 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 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1925 ASSERT(!isAcceleratedCompositingActive()); | 1925 ASSERT(!isAcceleratedCompositingActive()); |
| 1926 | 1926 |
| 1927 double paintStart = currentTime(); | 1927 double paintStart = currentTime(); |
| 1928 PageWidgetDelegate::paint(*m_page, canvas, rect, *m_page->deprecatedLocalMai
nFrame()); | 1928 PageWidgetDelegate::paint(*m_page, canvas, rect, *m_page->deprecatedLocalMai
nFrame()); |
| 1929 double paintEnd = currentTime(); | 1929 double paintEnd = currentTime(); |
| 1930 double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart); | 1930 double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart); |
| 1931 Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationM
S", (paintEnd - paintStart) * 1000, 0, 120, 30); | 1931 Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationM
S", (paintEnd - paintStart) * 1000, 0, 120, 30); |
| 1932 Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPe
rSecond", pixelsPerSec / 1000000, 10, 210, 30); | 1932 Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPe
rSecond", pixelsPerSec / 1000000, 10, 210, 30); |
| 1933 } | 1933 } |
| 1934 | 1934 |
| 1935 void WebViewImpl::didCommitCompositorFrame() |
| 1936 { |
| 1937 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 1938 return; |
| 1939 FrameView* view = mainFrameImpl()->frameView(); |
| 1940 view->finalizeLifecycleUpdate(); |
| 1941 } |
| 1942 |
| 1935 #if OS(ANDROID) | 1943 #if OS(ANDROID) |
| 1936 void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& re
ct) | 1944 void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& re
ct) |
| 1937 { | 1945 { |
| 1938 // Note: This method exists on OS(ANDROID) and will hopefully be | 1946 // Note: This method exists on OS(ANDROID) and will hopefully be |
| 1939 // removed once the link disambiguation feature renders using | 1947 // removed once the link disambiguation feature renders using |
| 1940 // the compositor. | 1948 // the compositor. |
| 1941 ASSERT(isAcceleratedCompositingActive()); | 1949 ASSERT(isAcceleratedCompositingActive()); |
| 1942 | 1950 |
| 1943 PageWidgetDelegate::paintIgnoringCompositing(*m_page, canvas, rect, *m_page-
>deprecatedLocalMainFrame()); | 1951 PageWidgetDelegate::paintIgnoringCompositing(*m_page, canvas, rect, *m_page-
>deprecatedLocalMainFrame()); |
| 1944 } | 1952 } |
| (...skipping 2484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4429 if (m_pageColorOverlay) | 4437 if (m_pageColorOverlay) |
| 4430 m_pageColorOverlay->update(); | 4438 m_pageColorOverlay->update(); |
| 4431 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4439 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4432 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4440 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4433 if (inspectorPageOverlay) | 4441 if (inspectorPageOverlay) |
| 4434 inspectorPageOverlay->update(); | 4442 inspectorPageOverlay->update(); |
| 4435 } | 4443 } |
| 4436 } | 4444 } |
| 4437 | 4445 |
| 4438 } // namespace blink | 4446 } // namespace blink |
| OLD | NEW |