diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:00:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:00:51 -0800 |
| commit | bc0688665b65cce4fec4a58f289e8fbac55af976 (patch) | |
| tree | 36882563e661afd21008ad31d761f1e5a170f9eb /WebCore/rendering/style/RenderStyle.cpp | |
| parent | 9443700060dfd3b488a3bdf30cfa547135478a7f (diff) | |
| parent | b880d713c04257ca40abfef97c300afdead423b8 (diff) | |
| download | external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.zip external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.gz external_webkit-bc0688665b65cce4fec4a58f289e8fbac55af976.tar.bz2 | |
am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit 'b880d713c04257ca40abfef97c300afdead423b8'
* commit 'b880d713c04257ca40abfef97c300afdead423b8':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/rendering/style/RenderStyle.cpp')
| -rw-r--r-- | WebCore/rendering/style/RenderStyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/style/RenderStyle.cpp b/WebCore/rendering/style/RenderStyle.cpp index a861fea..59d40b4 100644 --- a/WebCore/rendering/style/RenderStyle.cpp +++ b/WebCore/rendering/style/RenderStyle.cpp @@ -454,8 +454,8 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon if (inherited->m_effectiveZoom != other->inherited->m_effectiveZoom) return StyleDifferenceLayout; - if (rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1 || - rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1) { + if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1) || + (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1)) { // FIXME: We should add an optimized form of layout that just recomputes visual overflow. return StyleDifferenceLayout; } |