Chromium Code Reviews| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 #include "platform/PlatformGestureEvent.h" | 106 #include "platform/PlatformGestureEvent.h" |
| 107 #include "platform/PlatformKeyboardEvent.h" | 107 #include "platform/PlatformKeyboardEvent.h" |
| 108 #include "platform/PlatformMouseEvent.h" | 108 #include "platform/PlatformMouseEvent.h" |
| 109 #include "platform/RuntimeEnabledFeatures.h" | 109 #include "platform/RuntimeEnabledFeatures.h" |
| 110 #include "platform/TraceEvent.h" | 110 #include "platform/TraceEvent.h" |
| 111 #include "platform/UserGestureIndicator.h" | 111 #include "platform/UserGestureIndicator.h" |
| 112 #include "platform/exported/WebActiveGestureAnimation.h" | 112 #include "platform/exported/WebActiveGestureAnimation.h" |
| 113 #include "platform/fonts/FontCache.h" | 113 #include "platform/fonts/FontCache.h" |
| 114 #include "platform/graphics/Color.h" | 114 #include "platform/graphics/Color.h" |
| 115 #include "platform/graphics/CompositorFactory.h" | 115 #include "platform/graphics/CompositorFactory.h" |
| 116 #include "platform/graphics/CompositorMutatorClient.h" | |
| 116 #include "platform/graphics/FirstPaintInvalidationTracking.h" | 117 #include "platform/graphics/FirstPaintInvalidationTracking.h" |
| 117 #include "platform/graphics/GraphicsContext.h" | 118 #include "platform/graphics/GraphicsContext.h" |
| 118 #include "platform/graphics/Image.h" | 119 #include "platform/graphics/Image.h" |
| 119 #include "platform/graphics/ImageBuffer.h" | 120 #include "platform/graphics/ImageBuffer.h" |
| 120 #include "platform/graphics/gpu/DrawingBuffer.h" | 121 #include "platform/graphics/gpu/DrawingBuffer.h" |
| 121 #include "platform/graphics/paint/DrawingRecorder.h" | 122 #include "platform/graphics/paint/DrawingRecorder.h" |
| 122 #include "platform/scroll/ScrollbarTheme.h" | 123 #include "platform/scroll/ScrollbarTheme.h" |
| 123 #include "platform/weborigin/SchemeRegistry.h" | 124 #include "platform/weborigin/SchemeRegistry.h" |
| 124 #include "public/platform/Platform.h" | 125 #include "public/platform/Platform.h" |
| 125 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h" | 126 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h" |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 145 #include "public/web/WebMediaPlayerAction.h" | 146 #include "public/web/WebMediaPlayerAction.h" |
| 146 #include "public/web/WebNode.h" | 147 #include "public/web/WebNode.h" |
| 147 #include "public/web/WebPlugin.h" | 148 #include "public/web/WebPlugin.h" |
| 148 #include "public/web/WebPluginAction.h" | 149 #include "public/web/WebPluginAction.h" |
| 149 #include "public/web/WebRange.h" | 150 #include "public/web/WebRange.h" |
| 150 #include "public/web/WebSelection.h" | 151 #include "public/web/WebSelection.h" |
| 151 #include "public/web/WebTextInputInfo.h" | 152 #include "public/web/WebTextInputInfo.h" |
| 152 #include "public/web/WebViewClient.h" | 153 #include "public/web/WebViewClient.h" |
| 153 #include "public/web/WebWindowFeatures.h" | 154 #include "public/web/WebWindowFeatures.h" |
| 154 #include "web/CompositionUnderlineVectorBuilder.h" | 155 #include "web/CompositionUnderlineVectorBuilder.h" |
| 156 #include "web/CompositorMutatorImpl.h" | |
| 155 #include "web/ContextFeaturesClientImpl.h" | 157 #include "web/ContextFeaturesClientImpl.h" |
| 156 #include "web/ContextMenuAllowedScope.h" | 158 #include "web/ContextMenuAllowedScope.h" |
| 157 #include "web/DatabaseClientImpl.h" | 159 #include "web/DatabaseClientImpl.h" |
| 158 #include "web/DevToolsEmulator.h" | 160 #include "web/DevToolsEmulator.h" |
| 159 #include "web/FullscreenController.h" | 161 #include "web/FullscreenController.h" |
| 160 #include "web/InspectorOverlay.h" | 162 #include "web/InspectorOverlay.h" |
| 161 #include "web/LinkHighlightImpl.h" | 163 #include "web/LinkHighlightImpl.h" |
| 162 #include "web/PageOverlay.h" | 164 #include "web/PageOverlay.h" |
| 163 #include "web/PrerendererClientImpl.h" | 165 #include "web/PrerendererClientImpl.h" |
| 164 #include "web/ResizeViewportAnchor.h" | 166 #include "web/ResizeViewportAnchor.h" |
| (...skipping 4373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4538 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4540 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4539 { | 4541 { |
| 4540 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4542 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4541 } | 4543 } |
| 4542 | 4544 |
| 4543 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4545 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
| 4544 { | 4546 { |
| 4545 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4547 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
| 4546 } | 4548 } |
| 4547 | 4549 |
| 4550 CompositorProxyClient* WebViewImpl::createCompositorProxyClient() | |
| 4551 { | |
| 4552 if (!m_mutator.get()) { | |
|
jbroman
2016/04/20 19:24:51
nit: "if (!m_mutator) {"
flackr
2016/04/25 14:06:28
Done.
| |
| 4553 m_mutator = CompositorMutatorImpl::create(); | |
| 4554 m_layerTreeView->setMutatorClient(m_mutator->client()); | |
| 4555 } | |
| 4556 return m_mutator->createCompositorProxyClient(); | |
| 4557 } | |
| 4558 | |
| 4548 void WebViewImpl::updatePageOverlays() | 4559 void WebViewImpl::updatePageOverlays() |
| 4549 { | 4560 { |
| 4550 if (m_pageColorOverlay) | 4561 if (m_pageColorOverlay) |
| 4551 m_pageColorOverlay->update(); | 4562 m_pageColorOverlay->update(); |
| 4552 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4563 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4553 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4564 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4554 if (inspectorPageOverlay) | 4565 if (inspectorPageOverlay) |
| 4555 inspectorPageOverlay->update(); | 4566 inspectorPageOverlay->update(); |
| 4556 } | 4567 } |
| 4557 } | 4568 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4590 { | 4601 { |
| 4591 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than | 4602 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than |
| 4592 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4603 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4593 if (!page()) | 4604 if (!page()) |
| 4594 return 1; | 4605 return 1; |
| 4595 | 4606 |
| 4596 return page()->deviceScaleFactor(); | 4607 return page()->deviceScaleFactor(); |
| 4597 } | 4608 } |
| 4598 | 4609 |
| 4599 } // namespace blink | 4610 } // namespace blink |
| OLD | NEW |