Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 15301006: Merged GraphicsContext3DPrivate into GraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed ExtractWebGraphicsContext3D Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #include "core/platform/NotImplemented.h" 133 #include "core/platform/NotImplemented.h"
134 #include "core/platform/PlatformGestureEvent.h" 134 #include "core/platform/PlatformGestureEvent.h"
135 #include "core/platform/PlatformKeyboardEvent.h" 135 #include "core/platform/PlatformKeyboardEvent.h"
136 #include "core/platform/PlatformMouseEvent.h" 136 #include "core/platform/PlatformMouseEvent.h"
137 #include "core/platform/PlatformWheelEvent.h" 137 #include "core/platform/PlatformWheelEvent.h"
138 #include "core/platform/PopupMenuClient.h" 138 #include "core/platform/PopupMenuClient.h"
139 #include "core/platform/Timer.h" 139 #include "core/platform/Timer.h"
140 #include "core/platform/chromium/KeyboardCodes.h" 140 #include "core/platform/chromium/KeyboardCodes.h"
141 #include "core/platform/chromium/PopupContainer.h" 141 #include "core/platform/chromium/PopupContainer.h"
142 #include "core/platform/chromium/TraceEvent.h" 142 #include "core/platform/chromium/TraceEvent.h"
143 #include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
144 #include "core/platform/chromium/support/WebActiveGestureAnimation.h" 143 #include "core/platform/chromium/support/WebActiveGestureAnimation.h"
145 #include "core/platform/graphics/Color.h" 144 #include "core/platform/graphics/Color.h"
146 #include "core/platform/graphics/ColorSpace.h" 145 #include "core/platform/graphics/ColorSpace.h"
147 #include "core/platform/graphics/Extensions3D.h" 146 #include "core/platform/graphics/Extensions3D.h"
148 #include "core/platform/graphics/FontDescription.h" 147 #include "core/platform/graphics/FontDescription.h"
149 #include "core/platform/graphics/GraphicsContext.h" 148 #include "core/platform/graphics/GraphicsContext.h"
150 #include "core/platform/graphics/GraphicsContext3D.h" 149 #include "core/platform/graphics/GraphicsContext3D.h"
151 #include "core/platform/graphics/Image.h" 150 #include "core/platform/graphics/Image.h"
152 #include "core/platform/graphics/ImageBuffer.h" 151 #include "core/platform/graphics/ImageBuffer.h"
153 #include "core/platform/graphics/chromium/LayerPainterChromium.h" 152 #include "core/platform/graphics/chromium/LayerPainterChromium.h"
(...skipping 4057 matching lines...) Expand 10 before | Expand all | Expand 10 after
4211 } 4210 }
4212 4211
4213 bool WebViewImpl::shouldDisableDesktopWorkarounds() 4212 bool WebViewImpl::shouldDisableDesktopWorkarounds()
4214 { 4213 {
4215 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); 4214 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments();
4216 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom 4215 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom
4217 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); 4216 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto);
4218 } 4217 }
4219 4218
4220 } // namespace WebKit 4219 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp ('k') | Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698