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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
135 #include "core/platform/graphics/GraphicsContext.h" | 135 #include "core/platform/graphics/GraphicsContext.h" |
136 #include "core/platform/graphics/GraphicsContext3D.h" | 136 #include "core/platform/graphics/GraphicsContext3D.h" |
137 #include "core/platform/graphics/Image.h" | 137 #include "core/platform/graphics/Image.h" |
138 #include "core/platform/graphics/ImageBuffer.h" | 138 #include "core/platform/graphics/ImageBuffer.h" |
139 #include "core/platform/graphics/chromium/LayerPainterChromium.h" | 139 #include "core/platform/graphics/chromium/LayerPainterChromium.h" |
140 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h" | 140 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h" |
141 #include "core/platform/network/ResourceHandle.h" | 141 #include "core/platform/network/ResourceHandle.h" |
142 #include "core/rendering/RenderLayerCompositor.h" | 142 #include "core/rendering/RenderLayerCompositor.h" |
143 #include "core/rendering/RenderView.h" | 143 #include "core/rendering/RenderView.h" |
144 #include "core/rendering/RenderWidget.h" | 144 #include "core/rendering/RenderWidget.h" |
145 #include "modules/device_orientation/DeviceMotionController.h" | |
abarth-chromium
2013/05/07 16:43:47
Is this still needed?
timvolodine
2013/05/07 19:02:30
Done.
| |
145 #include "painting/ContinuousPainter.h" | 146 #include "painting/ContinuousPainter.h" |
146 #include "painting/GraphicsContextBuilder.h" | 147 #include "painting/GraphicsContextBuilder.h" |
147 #include "src/WebActiveGestureAnimation.h" | 148 #include "src/WebActiveGestureAnimation.h" |
148 #include <public/Platform.h> | 149 #include <public/Platform.h> |
149 #include <public/WebCompositorOutputSurface.h> | 150 #include <public/WebCompositorOutputSurface.h> |
150 #include <public/WebCompositorSupport.h> | 151 #include <public/WebCompositorSupport.h> |
151 #include <public/WebDragData.h> | 152 #include <public/WebDragData.h> |
152 #include <public/WebFloatPoint.h> | 153 #include <public/WebFloatPoint.h> |
153 #include <public/WebGraphicsContext3D.h> | 154 #include <public/WebGraphicsContext3D.h> |
154 #include <public/WebImage.h> | 155 #include <public/WebImage.h> |
(...skipping 4058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4213 } | 4214 } |
4214 | 4215 |
4215 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 4216 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
4216 { | 4217 { |
4217 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); | 4218 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); |
4218 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom | 4219 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom |
4219 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); | 4220 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); |
4220 } | 4221 } |
4221 | 4222 |
4222 } // namespace WebKit | 4223 } // namespace WebKit |
OLD | NEW |