| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 | 431 |
| 432 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); | 432 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); |
| 433 | 433 |
| 434 // This avoids painting garbage between columns if there is a column gap. | 434 // This avoids painting garbage between columns if there is a column gap. |
| 435 if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated
) | 435 if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated
) |
| 436 paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundC
olor()); | 436 paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundC
olor()); |
| 437 | 437 |
| 438 paintObject(paintInfo, paintOffset); | 438 paintObject(paintInfo, paintOffset); |
| 439 } | 439 } |
| 440 | 440 |
| 441 static inline bool isComposited(RenderObject* object) | |
| 442 { | |
| 443 return object->hasLayer() && toRenderLayerModelObject(object)->layer()->isCo
mposited(); | |
| 444 } | |
| 445 | |
| 446 static inline bool rendererObscuresBackground(RenderObject* rootObject) | 441 static inline bool rendererObscuresBackground(RenderObject* rootObject) |
| 447 { | 442 { |
| 448 if (!rootObject) | 443 if (!rootObject) |
| 449 return false; | 444 return false; |
| 450 | 445 |
| 451 RenderStyle* style = rootObject->style(); | 446 RenderStyle* style = rootObject->style(); |
| 452 if (style->visibility() != VISIBLE | 447 if (style->visibility() != VISIBLE |
| 453 || style->opacity() != 1 | 448 || style->opacity() != 1 |
| 454 || style->hasTransform()) | 449 || style->hasTransform()) |
| 455 return false; | 450 return false; |
| 456 | 451 |
| 457 if (isComposited(rootObject)) | 452 if (rootObject->compositingState() == PaintsIntoOwnBacking) |
| 458 return false; | 453 return false; |
| 459 | 454 |
| 460 const RenderObject* rootRenderer = rootObject->rendererForRootBackground(); | 455 const RenderObject* rootRenderer = rootObject->rendererForRootBackground(); |
| 461 if (rootRenderer->style()->backgroundClip() == TextFillBox) | 456 if (rootRenderer->style()->backgroundClip() == TextFillBox) |
| 462 return false; | 457 return false; |
| 463 | 458 |
| 464 return true; | 459 return true; |
| 465 } | 460 } |
| 466 | 461 |
| 467 void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&) | 462 void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&) |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 #endif | 1227 #endif |
| 1233 | 1228 |
| 1234 if (layoutState) | 1229 if (layoutState) |
| 1235 layoutState->m_isPaginated = m_fragmenting; | 1230 layoutState->m_isPaginated = m_fragmenting; |
| 1236 | 1231 |
| 1237 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1232 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1238 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1233 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1239 } | 1234 } |
| 1240 | 1235 |
| 1241 } // namespace WebCore | 1236 } // namespace WebCore |
| OLD | NEW |