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

Side by Side Diff: cc/image_layer.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_browsertests Created 8 years, 1 month 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
« no previous file with comments | « cc/heads_up_display_unittest.cc ('k') | cc/image_layer_updater.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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 "config.h"
6
7 #include "cc/image_layer.h" 5 #include "cc/image_layer.h"
8 6
9 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
10 #include "cc/image_layer_updater.h" 8 #include "cc/image_layer_updater.h"
11 #include "cc/layer_updater.h" 9 #include "cc/layer_updater.h"
12 #include "cc/layer_tree_host.h" 10 #include "cc/layer_tree_host.h"
13 #include "cc/resource_update_queue.h" 11 #include "cc/resource_update_queue.h"
14 12
15 namespace cc { 13 namespace cc {
16 14
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 92 }
95 93
96 float ImageLayer::contentsScaleY() const 94 float ImageLayer::contentsScaleY() const
97 { 95 {
98 if (bounds().IsEmpty() || contentBounds().IsEmpty()) 96 if (bounds().IsEmpty() || contentBounds().IsEmpty())
99 return 1; 97 return 1;
100 return static_cast<float>(m_bitmap.height()) / bounds().height(); 98 return static_cast<float>(m_bitmap.height()) / bounds().height();
101 } 99 }
102 100
103 } // namespace cc 101 } // namespace cc
OLDNEW
« no previous file with comments | « cc/heads_up_display_unittest.cc ('k') | cc/image_layer_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698