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

Side by Side Diff: cc/trees/property_tree.h

Issue 1499793003: Fix classes that have too many virtuals for inline constructors. Base URL: https://chromium.googlesource.com/chromium/src.git@enable-virtuals-as-complexity
Patch Set: Finish fixing the codebase that's accessible from Linux. Created 5 years 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
« no previous file with comments | « cc/test/fake_proxy.cc ('k') | cc/trees/property_tree.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CC_TREES_PROPERTY_TREE_H_ 5 #ifndef CC_TREES_PROPERTY_TREE_H_
6 #define CC_TREES_PROPERTY_TREE_H_ 6 #define CC_TREES_PROPERTY_TREE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 float device_scale_factor_; 452 float device_scale_factor_;
453 float device_transform_scale_factor_; 453 float device_transform_scale_factor_;
454 gfx::Vector2dF inner_viewport_bounds_delta_; 454 gfx::Vector2dF inner_viewport_bounds_delta_;
455 gfx::Vector2dF outer_viewport_bounds_delta_; 455 gfx::Vector2dF outer_viewport_bounds_delta_;
456 std::vector<int> nodes_affected_by_inner_viewport_bounds_delta_; 456 std::vector<int> nodes_affected_by_inner_viewport_bounds_delta_;
457 std::vector<int> nodes_affected_by_outer_viewport_bounds_delta_; 457 std::vector<int> nodes_affected_by_outer_viewport_bounds_delta_;
458 }; 458 };
459 459
460 class CC_EXPORT ClipTree final : public PropertyTree<ClipNode> { 460 class CC_EXPORT ClipTree final : public PropertyTree<ClipNode> {
461 public: 461 public:
462 ClipTree();
danakj 2015/12/10 19:35:58 Can you explain why this change? The base class ha
Jeffrey Yasskin 2015/12/10 20:28:59 There's a templated base class, which gives an ini
463
462 bool operator==(const ClipTree& other) const; 464 bool operator==(const ClipTree& other) const;
463 465
464 void SetViewportClip(gfx::RectF viewport_rect); 466 void SetViewportClip(gfx::RectF viewport_rect);
465 gfx::RectF ViewportClip(); 467 gfx::RectF ViewportClip();
466 468
467 void ToProtobuf(proto::PropertyTree* proto) const; 469 void ToProtobuf(proto::PropertyTree* proto) const;
468 void FromProtobuf(const proto::PropertyTree& proto); 470 void FromProtobuf(const proto::PropertyTree& proto);
469 }; 471 };
470 472
471 class CC_EXPORT EffectTree final : public PropertyTree<EffectNode> { 473 class CC_EXPORT EffectTree final : public PropertyTree<EffectNode> {
472 public: 474 public:
475 EffectTree();
476
473 bool operator==(const EffectTree& other) const; 477 bool operator==(const EffectTree& other) const;
474 478
475 void UpdateOpacities(int id); 479 void UpdateOpacities(int id);
476 480
477 void ToProtobuf(proto::PropertyTree* proto) const; 481 void ToProtobuf(proto::PropertyTree* proto) const;
478 void FromProtobuf(const proto::PropertyTree& proto); 482 void FromProtobuf(const proto::PropertyTree& proto);
479 }; 483 };
480 484
481 class CC_EXPORT PropertyTrees final { 485 class CC_EXPORT PropertyTrees final {
482 public: 486 public:
483 PropertyTrees(); 487 PropertyTrees();
484 488
485 bool operator==(const PropertyTrees& other) const; 489 bool operator==(const PropertyTrees& other) const;
486 490
487 void ToProtobuf(proto::PropertyTrees* proto) const; 491 void ToProtobuf(proto::PropertyTrees* proto) const;
488 void FromProtobuf(const proto::PropertyTrees& proto); 492 void FromProtobuf(const proto::PropertyTrees& proto);
489 493
490 TransformTree transform_tree; 494 TransformTree transform_tree;
491 EffectTree effect_tree; 495 EffectTree effect_tree;
492 ClipTree clip_tree; 496 ClipTree clip_tree;
493 bool needs_rebuild; 497 bool needs_rebuild;
494 bool non_root_surfaces_enabled; 498 bool non_root_surfaces_enabled;
495 int sequence_number; 499 int sequence_number;
496 }; 500 };
497 501
498 } // namespace cc 502 } // namespace cc
499 503
500 #endif // CC_TREES_PROPERTY_TREE_H_ 504 #endif // CC_TREES_PROPERTY_TREE_H_
OLDNEW
« no previous file with comments | « cc/test/fake_proxy.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698