| 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 4511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4522 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4522 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4523 { | 4523 { |
| 4524 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4524 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4525 } | 4525 } |
| 4526 | 4526 |
| 4527 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4527 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
| 4528 { | 4528 { |
| 4529 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4529 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
| 4530 } | 4530 } |
| 4531 | 4531 |
| 4532 CompositorProxyClient* WebViewImpl::createCompositorProxyClient() | 4532 CompositorProxyClient* WebViewImpl::createCompositorProxyClient(WorkerClients& c
lients) |
| 4533 { | 4533 { |
| 4534 if (!m_mutator) { | 4534 if (!m_mutator) { |
| 4535 std::unique_ptr<CompositorMutatorClient> mutatorClient = CompositorMutat
orImpl::createClient(); | 4535 std::unique_ptr<CompositorMutatorClient> mutatorClient = CompositorMutat
orImpl::createClient(); |
| 4536 m_mutator = static_cast<CompositorMutatorImpl*>(mutatorClient->mutator()
); | 4536 m_mutator = static_cast<CompositorMutatorImpl*>(mutatorClient->mutator()
); |
| 4537 m_layerTreeView->setMutatorClient(std::move(mutatorClient)); | 4537 m_layerTreeView->setMutatorClient(std::move(mutatorClient)); |
| 4538 } | 4538 } |
| 4539 return new CompositorProxyClientImpl(m_mutator); | 4539 return new CompositorProxyClientImpl(m_mutator, clients); |
| 4540 } | 4540 } |
| 4541 | 4541 |
| 4542 void WebViewImpl::updatePageOverlays() | 4542 void WebViewImpl::updatePageOverlays() |
| 4543 { | 4543 { |
| 4544 if (m_pageColorOverlay) | 4544 if (m_pageColorOverlay) |
| 4545 m_pageColorOverlay->update(); | 4545 m_pageColorOverlay->update(); |
| 4546 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4546 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4547 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4547 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4548 if (inspectorPageOverlay) | 4548 if (inspectorPageOverlay) |
| 4549 inspectorPageOverlay->update(); | 4549 inspectorPageOverlay->update(); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4600 return nullptr; | 4600 return nullptr; |
| 4601 return focusedFrame; | 4601 return focusedFrame; |
| 4602 } | 4602 } |
| 4603 | 4603 |
| 4604 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const | 4604 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const |
| 4605 { | 4605 { |
| 4606 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4606 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
| 4607 } | 4607 } |
| 4608 | 4608 |
| 4609 } // namespace blink | 4609 } // namespace blink |
| OLD | NEW |