From e78cbe89e6f337f2f1fe40315be88f742b547151 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 26 May 2010 10:11:43 +0100 Subject: Merge WebKit at r60074: Initial merge by git Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7 --- WebCore/rendering/RenderBoxModelObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/rendering/RenderBoxModelObject.cpp') diff --git a/WebCore/rendering/RenderBoxModelObject.cpp b/WebCore/rendering/RenderBoxModelObject.cpp index 9caf46f..1a72957 100644 --- a/WebCore/rendering/RenderBoxModelObject.cpp +++ b/WebCore/rendering/RenderBoxModelObject.cpp @@ -304,7 +304,7 @@ void RenderBoxModelObject::updateBoxModelInfoFromStyle() { // Set the appropriate bits for a box model object. Since all bits are cleared in styleWillChange, // we only check for bits that could possibly be set to true. - setHasBoxDecorations(style()->hasBorder() || style()->hasBackground() || style()->hasAppearance() || style()->boxShadow()); + setHasBoxDecorations(hasBackground() || style()->hasBorder() || style()->hasAppearance() || style()->boxShadow()); setInline(style()->isDisplayInlineType()); setRelPositioned(style()->position() == RelativePosition); } @@ -1321,7 +1321,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int rect.setHeight(rect.height() - borderTop() - borderBottom()); } - bool hasOpaqueBackground = s->backgroundColor().isValid() && s->backgroundColor().alpha() == 255; + bool hasOpaqueBackground = s->visitedDependentColor(CSSPropertyBackgroundColor).isValid() && s->visitedDependentColor(CSSPropertyBackgroundColor).alpha() == 255; for (const ShadowData* shadow = s->boxShadow(); shadow; shadow = shadow->next()) { if (shadow->style() != shadowStyle) continue; -- cgit v1.1