| 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/CompositorMutation.h" | 115 #include "platform/graphics/CompositorMutation.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 18 matching lines...) Expand all Loading... |
| 144 #include "public/web/WebMediaPlayerAction.h" | 145 #include "public/web/WebMediaPlayerAction.h" |
| 145 #include "public/web/WebNode.h" | 146 #include "public/web/WebNode.h" |
| 146 #include "public/web/WebPlugin.h" | 147 #include "public/web/WebPlugin.h" |
| 147 #include "public/web/WebPluginAction.h" | 148 #include "public/web/WebPluginAction.h" |
| 148 #include "public/web/WebRange.h" | 149 #include "public/web/WebRange.h" |
| 149 #include "public/web/WebSelection.h" | 150 #include "public/web/WebSelection.h" |
| 150 #include "public/web/WebTextInputInfo.h" | 151 #include "public/web/WebTextInputInfo.h" |
| 151 #include "public/web/WebViewClient.h" | 152 #include "public/web/WebViewClient.h" |
| 152 #include "public/web/WebWindowFeatures.h" | 153 #include "public/web/WebWindowFeatures.h" |
| 153 #include "web/CompositionUnderlineVectorBuilder.h" | 154 #include "web/CompositionUnderlineVectorBuilder.h" |
| 155 #include "web/CompositorMutatorImpl.h" |
| 154 #include "web/ContextFeaturesClientImpl.h" | 156 #include "web/ContextFeaturesClientImpl.h" |
| 155 #include "web/ContextMenuAllowedScope.h" | 157 #include "web/ContextMenuAllowedScope.h" |
| 156 #include "web/DatabaseClientImpl.h" | 158 #include "web/DatabaseClientImpl.h" |
| 157 #include "web/DevToolsEmulator.h" | 159 #include "web/DevToolsEmulator.h" |
| 158 #include "web/FullscreenController.h" | 160 #include "web/FullscreenController.h" |
| 159 #include "web/GraphicsLayerFactoryChromium.h" | 161 #include "web/GraphicsLayerFactoryChromium.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" |
| (...skipping 4431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4595 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4597 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4596 { | 4598 { |
| 4597 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4599 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4598 } | 4600 } |
| 4599 | 4601 |
| 4600 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4602 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
| 4601 { | 4603 { |
| 4602 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4604 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
| 4603 } | 4605 } |
| 4604 | 4606 |
| 4607 CompositorProxyClient* WebViewImpl::createCompositorProxyClient() |
| 4608 { |
| 4609 if (!m_mutator.get()) { |
| 4610 m_mutator = CompositorMutatorImpl::create(); |
| 4611 m_layerTreeView->setMutatorClient(m_mutator->client()); |
| 4612 } |
| 4613 return m_mutator->createCompositorProxyClient(); |
| 4614 } |
| 4615 |
| 4605 void WebViewImpl::updatePageOverlays() | 4616 void WebViewImpl::updatePageOverlays() |
| 4606 { | 4617 { |
| 4607 if (m_pageColorOverlay) | 4618 if (m_pageColorOverlay) |
| 4608 m_pageColorOverlay->update(); | 4619 m_pageColorOverlay->update(); |
| 4609 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4620 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4610 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4621 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4611 if (inspectorPageOverlay) | 4622 if (inspectorPageOverlay) |
| 4612 inspectorPageOverlay->update(); | 4623 inspectorPageOverlay->update(); |
| 4613 } | 4624 } |
| 4614 } | 4625 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4649 { | 4660 { |
| 4650 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4661 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4651 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4662 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4652 if (!page()) | 4663 if (!page()) |
| 4653 return 1; | 4664 return 1; |
| 4654 | 4665 |
| 4655 return page()->deviceScaleFactor(); | 4666 return page()->deviceScaleFactor(); |
| 4656 } | 4667 } |
| 4657 | 4668 |
| 4658 } // namespace blink | 4669 } // namespace blink |
| OLD | NEW |