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 4498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4509 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4509 void WebViewImpl::forceNextWebGLContextCreationToFail() |
4510 { | 4510 { |
4511 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4511 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
4512 } | 4512 } |
4513 | 4513 |
4514 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4514 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
4515 { | 4515 { |
4516 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4516 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
4517 } | 4517 } |
4518 | 4518 |
4519 CompositorProxyClient* WebViewImpl::createCompositorProxyClient() | 4519 CompositorProxyClient* WebViewImpl::createCompositorProxyClient(WorkerClients& c
lients) |
4520 { | 4520 { |
4521 if (!m_mutator) { | 4521 if (!m_mutator) { |
4522 std::unique_ptr<CompositorMutatorClient> mutatorClient = CompositorMutat
orImpl::createClient(); | 4522 std::unique_ptr<CompositorMutatorClient> mutatorClient = CompositorMutat
orImpl::createClient(); |
4523 m_mutator = static_cast<CompositorMutatorImpl*>(mutatorClient->mutator()
); | 4523 m_mutator = static_cast<CompositorMutatorImpl*>(mutatorClient->mutator()
); |
4524 m_layerTreeView->setMutatorClient(std::move(mutatorClient)); | 4524 m_layerTreeView->setMutatorClient(std::move(mutatorClient)); |
4525 } | 4525 } |
4526 return new CompositorProxyClientImpl(m_mutator); | 4526 return new CompositorProxyClientImpl(m_mutator, clients); |
4527 } | 4527 } |
4528 | 4528 |
4529 void WebViewImpl::updatePageOverlays() | 4529 void WebViewImpl::updatePageOverlays() |
4530 { | 4530 { |
4531 if (m_pageColorOverlay) | 4531 if (m_pageColorOverlay) |
4532 m_pageColorOverlay->update(); | 4532 m_pageColorOverlay->update(); |
4533 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4533 if (InspectorOverlay* overlay = inspectorOverlay()) { |
4534 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4534 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
4535 if (inspectorPageOverlay) | 4535 if (inspectorPageOverlay) |
4536 inspectorPageOverlay->update(); | 4536 inspectorPageOverlay->update(); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4571 { | 4571 { |
4572 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4572 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
4573 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4573 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
4574 if (!page()) | 4574 if (!page()) |
4575 return 1; | 4575 return 1; |
4576 | 4576 |
4577 return page()->deviceScaleFactor(); | 4577 return page()->deviceScaleFactor(); |
4578 } | 4578 } |
4579 | 4579 |
4580 } // namespace blink | 4580 } // namespace blink |
OLD | NEW |