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

Side by Side Diff: sky/engine/core/rendering/style/StyleVisualData.h

Issue 714013002: Remove some more zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 24 matching lines...) Expand all
35 class StyleVisualData : public RefCounted<StyleVisualData> { 35 class StyleVisualData : public RefCounted<StyleVisualData> {
36 public: 36 public:
37 static PassRefPtr<StyleVisualData> create() { return adoptRef(new StyleVisua lData); } 37 static PassRefPtr<StyleVisualData> create() { return adoptRef(new StyleVisua lData); }
38 PassRefPtr<StyleVisualData> copy() const { return adoptRef(new StyleVisualDa ta(*this)); } 38 PassRefPtr<StyleVisualData> copy() const { return adoptRef(new StyleVisualDa ta(*this)); }
39 ~StyleVisualData(); 39 ~StyleVisualData();
40 40
41 bool operator==(const StyleVisualData& o) const 41 bool operator==(const StyleVisualData& o) const
42 { 42 {
43 return clip == o.clip 43 return clip == o.clip
44 && hasAutoClip == o.hasAutoClip 44 && hasAutoClip == o.hasAutoClip
45 && textDecoration == o.textDecoration 45 && textDecoration == o.textDecoration;
46 && m_zoom == o.m_zoom;
47 } 46 }
48 bool operator!=(const StyleVisualData& o) const { return !(*this == o); } 47 bool operator!=(const StyleVisualData& o) const { return !(*this == o); }
49 48
50 LengthBox clip; 49 LengthBox clip;
51 bool hasAutoClip : 1; 50 bool hasAutoClip : 1;
52 unsigned textDecoration : TextDecorationBits; // Text decorations defined *o nly* by this element. 51 unsigned textDecoration : TextDecorationBits; // Text decorations defined *o nly* by this element.
53 52
54 float m_zoom;
55 53
56 private: 54 private:
57 StyleVisualData(); 55 StyleVisualData();
58 StyleVisualData(const StyleVisualData&); 56 StyleVisualData(const StyleVisualData&);
59 }; 57 };
60 58
61 } // namespace blink 59 } // namespace blink
62 60
63 #endif // StyleVisualData_h 61 #endif // StyleVisualData_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderView.cpp ('k') | sky/engine/core/rendering/style/StyleVisualData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698