| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 4 * reserved. | 4 * reserved. |
| 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 915 SetCursorDataInternal(new CursorList); | 915 SetCursorDataInternal(new CursorList); |
| 916 MutableCursorDataInternal()->push_back( | 916 MutableCursorDataInternal()->push_back( |
| 917 CursorData(image, hot_spot_specified, hot_spot)); | 917 CursorData(image, hot_spot_specified, hot_spot)); |
| 918 } | 918 } |
| 919 | 919 |
| 920 void ComputedStyle::SetCursorList(CursorList* other) { | 920 void ComputedStyle::SetCursorList(CursorList* other) { |
| 921 SetCursorDataInternal(other); | 921 SetCursorDataInternal(other); |
| 922 } | 922 } |
| 923 | 923 |
| 924 void ComputedStyle::SetQuotes(RefPtr<QuotesData> q) { | 924 void ComputedStyle::SetQuotes(RefPtr<QuotesData> q) { |
| 925 SetQuotesInternal(q); | 925 SetQuotesInternal(std::move(q)); |
| 926 } | 926 } |
| 927 | 927 |
| 928 bool ComputedStyle::QuotesDataEquivalent(const ComputedStyle& other) const { | 928 bool ComputedStyle::QuotesDataEquivalent(const ComputedStyle& other) const { |
| 929 return DataEquivalent(Quotes(), other.Quotes()); | 929 return DataEquivalent(Quotes(), other.Quotes()); |
| 930 } | 930 } |
| 931 | 931 |
| 932 void ComputedStyle::ClearCursorList() { | 932 void ComputedStyle::ClearCursorList() { |
| 933 if (CursorDataInternal()) | 933 if (CursorDataInternal()) |
| 934 SetCursorDataInternal(nullptr); | 934 SetCursorDataInternal(nullptr); |
| 935 } | 935 } |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1200 transform.Translate(point.X() - origin_x + origin_shift_x, | 1200 transform.Translate(point.X() - origin_x + origin_shift_x, |
| 1201 point.Y() - origin_y + origin_shift_y); | 1201 point.Y() - origin_y + origin_shift_y); |
| 1202 transform.Rotate(angle + motion_data.rotation_.angle); | 1202 transform.Rotate(angle + motion_data.rotation_.angle); |
| 1203 | 1203 |
| 1204 if (position.X() != Length(kAuto) || anchor.X() != Length(kAuto)) | 1204 if (position.X() != Length(kAuto) || anchor.X() != Length(kAuto)) |
| 1205 // Shift the origin back to transform-origin. | 1205 // Shift the origin back to transform-origin. |
| 1206 transform.Translate(-origin_shift_x, -origin_shift_y); | 1206 transform.Translate(-origin_shift_x, -origin_shift_y); |
| 1207 } | 1207 } |
| 1208 | 1208 |
| 1209 void ComputedStyle::SetTextShadow(RefPtr<ShadowList> s) { | 1209 void ComputedStyle::SetTextShadow(RefPtr<ShadowList> s) { |
| 1210 SetTextShadowInternal(s); | 1210 SetTextShadowInternal(std::move(s)); |
| 1211 } | 1211 } |
| 1212 | 1212 |
| 1213 bool ComputedStyle::TextShadowDataEquivalent(const ComputedStyle& other) const { | 1213 bool ComputedStyle::TextShadowDataEquivalent(const ComputedStyle& other) const { |
| 1214 return DataEquivalent(TextShadow(), other.TextShadow()); | 1214 return DataEquivalent(TextShadow(), other.TextShadow()); |
| 1215 } | 1215 } |
| 1216 | 1216 |
| 1217 void ComputedStyle::SetBoxShadow(RefPtr<ShadowList> s) { | 1217 void ComputedStyle::SetBoxShadow(RefPtr<ShadowList> s) { |
| 1218 rare_non_inherited_data_.Access()->box_shadow_ = std::move(s); | 1218 rare_non_inherited_data_.Access()->box_shadow_ = std::move(s); |
| 1219 } | 1219 } |
| 1220 | 1220 |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1870 | 1870 |
| 1871 if (AppliedTextDecorationsInternal()) | 1871 if (AppliedTextDecorationsInternal()) |
| 1872 SetAppliedTextDecorationsInternal(nullptr); | 1872 SetAppliedTextDecorationsInternal(nullptr); |
| 1873 } | 1873 } |
| 1874 | 1874 |
| 1875 void ComputedStyle::RestoreParentTextDecorations( | 1875 void ComputedStyle::RestoreParentTextDecorations( |
| 1876 const ComputedStyle& parent_style) { | 1876 const ComputedStyle& parent_style) { |
| 1877 SetHasSimpleUnderlineInternal(parent_style.HasSimpleUnderlineInternal()); | 1877 SetHasSimpleUnderlineInternal(parent_style.HasSimpleUnderlineInternal()); |
| 1878 if (AppliedTextDecorationsInternal() != | 1878 if (AppliedTextDecorationsInternal() != |
| 1879 parent_style.AppliedTextDecorationsInternal()) { | 1879 parent_style.AppliedTextDecorationsInternal()) { |
| 1880 SetAppliedTextDecorationsInternal( | 1880 SetAppliedTextDecorationsInternal(RefPtr<AppliedTextDecorationList>( |
| 1881 parent_style.AppliedTextDecorationsInternal()); | 1881 parent_style.AppliedTextDecorationsInternal())); |
| 1882 } | 1882 } |
| 1883 } | 1883 } |
| 1884 | 1884 |
| 1885 void ComputedStyle::ClearMultiCol() { | 1885 void ComputedStyle::ClearMultiCol() { |
| 1886 rare_non_inherited_data_.Access()->multi_col_ = nullptr; | 1886 rare_non_inherited_data_.Access()->multi_col_ = nullptr; |
| 1887 rare_non_inherited_data_.Access()->multi_col_.Init(); | 1887 rare_non_inherited_data_.Access()->multi_col_.Init(); |
| 1888 } | 1888 } |
| 1889 | 1889 |
| 1890 StyleColor ComputedStyle::DecorationColorIncludingFallback( | 1890 StyleColor ComputedStyle::DecorationColorIncludingFallback( |
| 1891 bool visited_link) const { | 1891 bool visited_link) const { |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2348 if (value < 0) | 2348 if (value < 0) |
| 2349 fvalue -= 0.5f; | 2349 fvalue -= 0.5f; |
| 2350 else | 2350 else |
| 2351 fvalue += 0.5f; | 2351 fvalue += 0.5f; |
| 2352 } | 2352 } |
| 2353 | 2353 |
| 2354 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); | 2354 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); |
| 2355 } | 2355 } |
| 2356 | 2356 |
| 2357 } // namespace blink | 2357 } // namespace blink |
| OLD | NEW |