| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 97 |
| 98 void ComputedStyle::invalidateInitialStyle() { | 98 void ComputedStyle::invalidateInitialStyle() { |
| 99 mutableInitialStyle().setTapHighlightColor(initialTapHighlightColor()); | 99 mutableInitialStyle().setTapHighlightColor(initialTapHighlightColor()); |
| 100 } | 100 } |
| 101 | 101 |
| 102 PassRefPtr<ComputedStyle> ComputedStyle::createAnonymousStyleWithDisplay( | 102 PassRefPtr<ComputedStyle> ComputedStyle::createAnonymousStyleWithDisplay( |
| 103 const ComputedStyle& parentStyle, | 103 const ComputedStyle& parentStyle, |
| 104 EDisplay display) { | 104 EDisplay display) { |
| 105 RefPtr<ComputedStyle> newStyle = ComputedStyle::create(); | 105 RefPtr<ComputedStyle> newStyle = ComputedStyle::create(); |
| 106 newStyle->inheritFrom(parentStyle); | 106 newStyle->inheritFrom(parentStyle); |
| 107 newStyle->inheritUnicodeBidiFrom(parentStyle); | 107 newStyle->setUnicodeBidi(parentStyle.unicodeBidi()); |
| 108 newStyle->setDisplay(display); | 108 newStyle->setDisplay(display); |
| 109 return newStyle; | 109 return newStyle; |
| 110 } | 110 } |
| 111 | 111 |
| 112 PassRefPtr<ComputedStyle> ComputedStyle::clone(const ComputedStyle& other) { | 112 PassRefPtr<ComputedStyle> ComputedStyle::clone(const ComputedStyle& other) { |
| 113 return adoptRef(new ComputedStyle(other)); | 113 return adoptRef(new ComputedStyle(other)); |
| 114 } | 114 } |
| 115 | 115 |
| 116 ALWAYS_INLINE ComputedStyle::ComputedStyle() | 116 ALWAYS_INLINE ComputedStyle::ComputedStyle() |
| 117 : ComputedStyleBase(), | 117 : ComputedStyleBase(), |
| (...skipping 2345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2463 if (value < 0) | 2463 if (value < 0) |
| 2464 fvalue -= 0.5f; | 2464 fvalue -= 0.5f; |
| 2465 else | 2465 else |
| 2466 fvalue += 0.5f; | 2466 fvalue += 0.5f; |
| 2467 } | 2467 } |
| 2468 | 2468 |
| 2469 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2469 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2470 } | 2470 } |
| 2471 | 2471 |
| 2472 } // namespace blink | 2472 } // namespace blink |
| OLD | NEW |