Chromium Code Reviews

Side by Side Diff: ui/gfx/compositor/compositor_cc.cc

Issue 9008078: Update WebLayerTreeViewClient overrides for WebKit API change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add override for layout() as well Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « ui/gfx/compositor/compositor_cc.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/compositor/compositor_cc.h" 5 #include "ui/gfx/compositor/compositor_cc.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "third_party/skia/include/images/SkImageEncoder.h" 8 #include "third_party/skia/include/images/SkImageEncoder.h"
9 #include "third_party/skia/include/core/SkBitmap.h" 9 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
(...skipping 219 matching lines...)
230 gfx::Rect(new_origin, bounds.size()))) { 230 gfx::Rect(new_origin, bounds.size()))) {
231 SwizzleRGBAToBGRAAndFlip(pixels, bounds.size()); 231 SwizzleRGBAToBGRAAndFlip(pixels, bounds.size());
232 return true; 232 return true;
233 } 233 }
234 return false; 234 return false;
235 } 235 }
236 236
237 void CompositorCC::animateAndLayout(double frameBeginTime) { 237 void CompositorCC::animateAndLayout(double frameBeginTime) {
238 } 238 }
239 239
240 void CompositorCC::updateAnimations(double frameBeginTime) {
241 }
242
243 void CompositorCC::layout() {
244 }
245
240 void CompositorCC::applyScrollAndScale(const WebKit::WebSize& scrollDelta, 246 void CompositorCC::applyScrollAndScale(const WebKit::WebSize& scrollDelta,
241 float scaleFactor) { 247 float scaleFactor) {
242 } 248 }
243 249
244 void CompositorCC::applyScrollDelta(const WebKit::WebSize&) { 250 void CompositorCC::applyScrollDelta(const WebKit::WebSize&) {
245 } 251 }
246 252
247 WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() { 253 WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
248 WebKit::WebGraphicsContext3D* context; 254 WebKit::WebGraphicsContext3D* context;
249 if (test_context_enabled) { 255 if (test_context_enabled) {
(...skipping 36 matching lines...)
286 switches::kDisableTestCompositor)) { 292 switches::kDisableTestCompositor)) {
287 test_context_enabled = true; 293 test_context_enabled = true;
288 } 294 }
289 } 295 }
290 296
291 COMPOSITOR_EXPORT void DisableTestCompositor() { 297 COMPOSITOR_EXPORT void DisableTestCompositor() {
292 test_context_enabled = false; 298 test_context_enabled = false;
293 } 299 }
294 300
295 } // namespace ui 301 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gfx/compositor/compositor_cc.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine