diff options
| author | Ben Murdoch <benm@google.com> | 2011-09-06 16:38:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 16:38:59 -0700 |
| commit | b044262815d6227fa0c72415ad4410992b65a35f (patch) | |
| tree | 4bead892aeae537cf0ce6ff534e8bf0b167f895a /Source/WebCore/dom/Element.cpp | |
| parent | 8adb29f3cabc1fbefbbf55da55a992feffaa6691 (diff) | |
| parent | 5dd0312de6141c88a66182f62629dad237b630f2 (diff) | |
| download | external_webkit-b044262815d6227fa0c72415ad4410992b65a35f.zip external_webkit-b044262815d6227fa0c72415ad4410992b65a35f.tar.gz external_webkit-b044262815d6227fa0c72415ad4410992b65a35f.tar.bz2 | |
Merge "Fix logic error in Android style version calculation."
Diffstat (limited to 'Source/WebCore/dom/Element.cpp')
| -rw-r--r-- | Source/WebCore/dom/Element.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp index eef2419..64d3eed 100644 --- a/Source/WebCore/dom/Element.cpp +++ b/Source/WebCore/dom/Element.cpp @@ -1072,11 +1072,15 @@ bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS #ifdef ANDROID_STYLE_VERSION static bool displayDiff(const RenderStyle* s1, const RenderStyle* s2) { - if (!s1 || !s2) + if (!s1 && !s2) return false; + else if ((!s1 && s2) || (s1 && !s2)) + return true; + return s1->display() != s2->display() || s1->left() != s2->left() || s1->top() != s2->top() - || s1->right() != s2->right() || s1->bottom() != s2->bottom(); + || s1->right() != s2->right() || s1->bottom() != s2->bottom() + || s1->width() != s2->width() || s1->height() != s2->height(); } #endif |