--- a/webengine/osswebengine/WebCore/rendering/RenderObject.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/rendering/RenderObject.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -27,7 +27,7 @@
#include "AXObjectCache.h"
#include "AffineTransform.h"
-#include "CSSStyleSelector.h"
+#include "cssstyleselector.h"
#include "CachedImage.h"
#include "Chrome.h"
#include "Document.h"
@@ -2142,10 +2142,11 @@
bool affectsParentBlock = false;
RenderStyle::Diff d = RenderStyle::Equal;
if (m_style) {
+ d = m_style->diff(style);
+
// If our z-index changes value or our visibility changes,
// we need to dirty our stacking context's z-order list.
if (style) {
- d = m_style->diff(style);
if (m_style->visibility() != style->visibility() ||
m_style->zIndex() != style->zIndex() ||
m_style->hasAutoZIndex() != style->hasAutoZIndex())
@@ -2173,11 +2174,11 @@
}
}
#if PLATFORM(SYMBIAN)
- if (m_style->visibility() == HIDDEN &&
- style->visibility() == VISIBLE) {
- document()->page()->chrome()->setElementVisibilityChanged(true);
- }
- else if (style->position() != StaticPosition) {
+ if (m_style->visibility() != style->visibility()) {
+ document()->page()->chrome()->setElementVisibilityChanged(style->visibility() == VISIBLE);
+ }
+
+ if (style->position() != StaticPosition) {
if (style->left() != m_style->left() ||
style->right() != m_style->right() ||
@@ -2187,17 +2188,6 @@
document()->page()->chrome()->setElementVisibilityChanged(true);
}
}
- else {
- bool curr_style_hidden = (m_style->width().isFixed() && m_style->width().value() <= 0) ||
- (m_style->height().isFixed() && m_style->height().value() <= 0);
- bool new_style_hidden = (style->width().isFixed() && style->width().value() <= 0) ||
- (style->height().isFixed() && style->height().value() <= 0);
-
- if (curr_style_hidden && !new_style_hidden) {
- document()->page()->chrome()->setElementVisibilityChanged(true);
- }
- }
-
#endif
}
// If we have no layer(), just treat a RepaintLayer hint as a normal Repaint.