| 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 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 #if OS(ANDROID) | 1924 #if OS(ANDROID) |
| 1925 void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& re
ct) | 1925 void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& re
ct) |
| 1926 { | 1926 { |
| 1927 // Note: This method exists on OS(ANDROID) and will hopefully be | 1927 // Note: This method exists on OS(ANDROID) and will hopefully be |
| 1928 // removed once the link disambiguation feature renders using | 1928 // removed once the link disambiguation feature renders using |
| 1929 // the compositor. | 1929 // the compositor. |
| 1930 ASSERT(isAcceleratedCompositingActive()); | 1930 ASSERT(isAcceleratedCompositingActive()); |
| 1931 | 1931 |
| 1932 FrameView* view = page()->deprecatedLocalMainFrame()->view(); | 1932 gGlobalPaintFlags = GlobalPaintFlattenCompositingLayers; |
| 1933 PaintBehavior oldPaintBehavior = view->paintBehavior(); | |
| 1934 view->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLay
ers); | |
| 1935 | 1933 |
| 1936 PageWidgetDelegate::paint(*m_page, pageOverlays(), canvas, rect, *m_page->de
precatedLocalMainFrame()); | 1934 PageWidgetDelegate::paint(*m_page, pageOverlays(), canvas, rect, *m_page->de
precatedLocalMainFrame()); |
| 1937 | 1935 |
| 1938 view->setPaintBehavior(oldPaintBehavior); | 1936 gGlobalPaintFlags = GlobalPaintNoFlag; |
| 1939 } | 1937 } |
| 1940 #endif | 1938 #endif |
| 1941 | 1939 |
| 1942 void WebViewImpl::layoutAndPaintAsync(WebLayoutAndPaintAsyncCallback* callback) | 1940 void WebViewImpl::layoutAndPaintAsync(WebLayoutAndPaintAsyncCallback* callback) |
| 1943 { | 1941 { |
| 1944 m_layerTreeView->layoutAndPaintAsync(callback); | 1942 m_layerTreeView->layoutAndPaintAsync(callback); |
| 1945 } | 1943 } |
| 1946 | 1944 |
| 1947 void WebViewImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback
* callback) | 1945 void WebViewImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback
* callback) |
| 1948 { | 1946 { |
| (...skipping 2444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4393 { | 4391 { |
| 4394 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4392 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4395 } | 4393 } |
| 4396 | 4394 |
| 4397 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4395 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
| 4398 { | 4396 { |
| 4399 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4397 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
| 4400 } | 4398 } |
| 4401 | 4399 |
| 4402 } // namespace blink | 4400 } // namespace blink |
| OLD | NEW |