Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2034393003: testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 #if OS(ANDROID) 2062 #if OS(ANDROID)
2063 void WebViewImpl::paintIgnoringCompositing(WebCanvas* canvas, const WebRect& rec t) 2063 void WebViewImpl::paintIgnoringCompositing(WebCanvas* canvas, const WebRect& rec t)
2064 { 2064 {
2065 // This is called on a composited WebViewImpl, but we will ignore it, 2065 // This is called on a composited WebViewImpl, but we will ignore it,
2066 // producing all possible content of the WebViewImpl into the WebCanvas. 2066 // producing all possible content of the WebViewImpl into the WebCanvas.
2067 DCHECK(isAcceleratedCompositingActive()); 2067 DCHECK(isAcceleratedCompositingActive());
2068 PageWidgetDelegate::paintIgnoringCompositing(*m_page, canvas, rect, *m_page- >deprecatedLocalMainFrame()); 2068 PageWidgetDelegate::paintIgnoringCompositing(*m_page, canvas, rect, *m_page- >deprecatedLocalMainFrame());
2069 } 2069 }
2070 #endif 2070 #endif
2071 2071
2072 void WebViewImpl::layoutAndPaintAsync(WebLayoutAndPaintAsyncCallback* callback)
2073 {
2074 m_layerTreeView->layoutAndPaintAsync(callback);
2075 }
2076
2077 void WebViewImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback * callback) 2072 void WebViewImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback * callback)
2078 { 2073 {
2079 m_layerTreeView->compositeAndReadbackAsync(callback); 2074 m_layerTreeView->compositeAndReadbackAsync(callback);
2080 } 2075 }
2081 2076
2082 void WebViewImpl::themeChanged() 2077 void WebViewImpl::themeChanged()
2083 { 2078 {
2084 if (!page()) 2079 if (!page())
2085 return; 2080 return;
2086 if (!page()->mainFrame()->isLocalFrame()) 2081 if (!page()->mainFrame()->isLocalFrame())
(...skipping 2466 matching lines...) Expand 10 before | Expand all | Expand 10 after
4553 { 4548 {
4554 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than 4549 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than
4555 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. 4550 // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
4556 if (!page()) 4551 if (!page())
4557 return 1; 4552 return 1;
4558 4553
4559 return page()->deviceScaleFactor(); 4554 return page()->deviceScaleFactor();
4560 } 4555 }
4561 4556
4562 } // namespace blink 4557 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698