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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 #include "public/web/WebMediaPlayerAction.h" | 144 #include "public/web/WebMediaPlayerAction.h" |
145 #include "public/web/WebNode.h" | 145 #include "public/web/WebNode.h" |
146 #include "public/web/WebPlugin.h" | 146 #include "public/web/WebPlugin.h" |
147 #include "public/web/WebPluginAction.h" | 147 #include "public/web/WebPluginAction.h" |
148 #include "public/web/WebRange.h" | 148 #include "public/web/WebRange.h" |
149 #include "public/web/WebSelection.h" | 149 #include "public/web/WebSelection.h" |
150 #include "public/web/WebTextInputInfo.h" | 150 #include "public/web/WebTextInputInfo.h" |
151 #include "public/web/WebViewClient.h" | 151 #include "public/web/WebViewClient.h" |
152 #include "public/web/WebWindowFeatures.h" | 152 #include "public/web/WebWindowFeatures.h" |
153 #include "web/CompositionUnderlineVectorBuilder.h" | 153 #include "web/CompositionUnderlineVectorBuilder.h" |
| 154 #include "web/CompositorProxyClientImpl.h" |
154 #include "web/ContextFeaturesClientImpl.h" | 155 #include "web/ContextFeaturesClientImpl.h" |
155 #include "web/ContextMenuAllowedScope.h" | 156 #include "web/ContextMenuAllowedScope.h" |
156 #include "web/DatabaseClientImpl.h" | 157 #include "web/DatabaseClientImpl.h" |
157 #include "web/DedicatedWorkerGlobalScopeProxyProviderImpl.h" | 158 #include "web/DedicatedWorkerGlobalScopeProxyProviderImpl.h" |
158 #include "web/DevToolsEmulator.h" | 159 #include "web/DevToolsEmulator.h" |
159 #include "web/FullscreenController.h" | 160 #include "web/FullscreenController.h" |
160 #include "web/InspectorOverlay.h" | 161 #include "web/InspectorOverlay.h" |
161 #include "web/LinkHighlightImpl.h" | 162 #include "web/LinkHighlightImpl.h" |
162 #include "web/PageOverlay.h" | 163 #include "web/PageOverlay.h" |
163 #include "web/PrerendererClientImpl.h" | 164 #include "web/PrerendererClientImpl.h" |
(...skipping 4308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4472 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4473 void WebViewImpl::forceNextWebGLContextCreationToFail() |
4473 { | 4474 { |
4474 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4475 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
4475 } | 4476 } |
4476 | 4477 |
4477 void WebViewImpl::forceNextDrawingBufferCreationToFail() | 4478 void WebViewImpl::forceNextDrawingBufferCreationToFail() |
4478 { | 4479 { |
4479 DrawingBuffer::forceNextDrawingBufferCreationToFail(); | 4480 DrawingBuffer::forceNextDrawingBufferCreationToFail(); |
4480 } | 4481 } |
4481 | 4482 |
| 4483 CompositorProxyClient* WebViewImpl::createCompositorProxyClient() |
| 4484 { |
| 4485 return new CompositorProxyClientImpl(); |
| 4486 } |
| 4487 |
4482 void WebViewImpl::updatePageOverlays() | 4488 void WebViewImpl::updatePageOverlays() |
4483 { | 4489 { |
4484 if (m_pageColorOverlay) | 4490 if (m_pageColorOverlay) |
4485 m_pageColorOverlay->update(); | 4491 m_pageColorOverlay->update(); |
4486 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4492 if (InspectorOverlay* overlay = inspectorOverlay()) { |
4487 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4493 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
4488 if (inspectorPageOverlay) | 4494 if (inspectorPageOverlay) |
4489 inspectorPageOverlay->update(); | 4495 inspectorPageOverlay->update(); |
4490 } | 4496 } |
4491 } | 4497 } |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4524 { | 4530 { |
4525 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4531 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
4526 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4532 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
4527 if (!page()) | 4533 if (!page()) |
4528 return 1; | 4534 return 1; |
4529 | 4535 |
4530 return page()->deviceScaleFactor(); | 4536 return page()->deviceScaleFactor(); |
4531 } | 4537 } |
4532 | 4538 |
4533 } // namespace blink | 4539 } // namespace blink |
OLD | NEW |