| 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 | 424 |
| 425 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); | 425 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); |
| 426 | 426 |
| 427 // This avoids painting garbage between columns if there is a column gap. | 427 // This avoids painting garbage between columns if there is a column gap. |
| 428 if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated
) | 428 if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated
) |
| 429 paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundC
olor()); | 429 paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundC
olor()); |
| 430 | 430 |
| 431 paintObject(paintInfo, paintOffset); | 431 paintObject(paintInfo, paintOffset); |
| 432 } | 432 } |
| 433 | 433 |
| 434 static inline bool isComposited(RenderObject* object) | |
| 435 { | |
| 436 return object->hasLayer() && toRenderLayerModelObject(object)->layer()->isCo
mposited(); | |
| 437 } | |
| 438 | |
| 439 static inline bool rendererObscuresBackground(RenderObject* rootObject) | 434 static inline bool rendererObscuresBackground(RenderObject* rootObject) |
| 440 { | 435 { |
| 441 if (!rootObject) | 436 if (!rootObject) |
| 442 return false; | 437 return false; |
| 443 | 438 |
| 444 RenderStyle* style = rootObject->style(); | 439 RenderStyle* style = rootObject->style(); |
| 445 if (style->visibility() != VISIBLE | 440 if (style->visibility() != VISIBLE |
| 446 || style->opacity() != 1 | 441 || style->opacity() != 1 |
| 447 || style->hasTransform()) | 442 || style->hasTransform()) |
| 448 return false; | 443 return false; |
| 449 | 444 |
| 450 if (isComposited(rootObject)) | 445 if (rootObject->compositingState() == PaintsIntoOwnBacking) |
| 451 return false; | 446 return false; |
| 452 | 447 |
| 453 const RenderObject* rootRenderer = rootObject->rendererForRootBackground(); | 448 const RenderObject* rootRenderer = rootObject->rendererForRootBackground(); |
| 454 if (rootRenderer->style()->backgroundClip() == TextFillBox) | 449 if (rootRenderer->style()->backgroundClip() == TextFillBox) |
| 455 return false; | 450 return false; |
| 456 | 451 |
| 457 return true; | 452 return true; |
| 458 } | 453 } |
| 459 | 454 |
| 460 void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&) | 455 void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&) |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1234 #endif | 1229 #endif |
| 1235 | 1230 |
| 1236 if (layoutState) | 1231 if (layoutState) |
| 1237 layoutState->m_isPaginated = m_fragmenting; | 1232 layoutState->m_isPaginated = m_fragmenting; |
| 1238 | 1233 |
| 1239 if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1234 if (m_flowThreadState != RenderObject::NotInsideFlowThread) |
| 1240 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1235 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); |
| 1241 } | 1236 } |
| 1242 | 1237 |
| 1243 } // namespace WebCore | 1238 } // namespace WebCore |
| OLD | NEW |