| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 } | 494 } |
| 495 | 495 |
| 496 void RenderBlock::paintChildAsInlineBlock(RenderBox* child, PaintInfo& paintInfo
, const LayoutPoint& paintOffset) | 496 void RenderBlock::paintChildAsInlineBlock(RenderBox* child, PaintInfo& paintInfo
, const LayoutPoint& paintOffset) |
| 497 { | 497 { |
| 498 if (!child->hasSelfPaintingLayer()) | 498 if (!child->hasSelfPaintingLayer()) |
| 499 paintAsInlineBlock(child, paintInfo, paintOffset); | 499 paintAsInlineBlock(child, paintInfo, paintOffset); |
| 500 } | 500 } |
| 501 | 501 |
| 502 void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf
o, const LayoutPoint& childPoint) | 502 void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInf
o, const LayoutPoint& childPoint) |
| 503 { | 503 { |
| 504 // FIXME(sky): Why don't masks go down this path? | 504 // FIXME(sky): Remove this function. |
| 505 if (paintInfo.phase == PaintPhaseMask) | |
| 506 return; | |
| 507 renderer->paint(paintInfo, childPoint); | 505 renderer->paint(paintInfo, childPoint); |
| 508 } | 506 } |
| 509 | 507 |
| 510 static inline bool hasCursorCaret(const FrameSelection& selection, const RenderB
lock* block) | 508 static inline bool hasCursorCaret(const FrameSelection& selection, const RenderB
lock* block) |
| 511 { | 509 { |
| 512 return selection.caretRenderer() == block && selection.hasEditableStyle(); | 510 return selection.caretRenderer() == block && selection.hasEditableStyle(); |
| 513 } | 511 } |
| 514 | 512 |
| 515 static inline bool hasDragCaret(const DragCaretController& dragCaretController,
const RenderBlock* block) | 513 static inline bool hasDragCaret(const DragCaretController& dragCaretController,
const RenderBlock* block) |
| 516 { | 514 { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 531 } | 529 } |
| 532 | 530 |
| 533 DragCaretController& dragCaretController = frame()->page()->dragCaretControl
ler(); | 531 DragCaretController& dragCaretController = frame()->page()->dragCaretControl
ler(); |
| 534 if (hasDragCaret(dragCaretController, this)) { | 532 if (hasDragCaret(dragCaretController, this)) { |
| 535 dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffs
et, paintInfo.rect); | 533 dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffs
et, paintInfo.rect); |
| 536 } | 534 } |
| 537 } | 535 } |
| 538 | 536 |
| 539 void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) | 537 void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) |
| 540 { | 538 { |
| 541 if (paintInfo.phase == PaintPhaseMask) { | |
| 542 paintMask(paintInfo, paintOffset); | |
| 543 return; | |
| 544 } | |
| 545 | |
| 546 if (hasBoxDecorationBackground()) | 539 if (hasBoxDecorationBackground()) |
| 547 paintBoxDecorationBackground(paintInfo, paintOffset); | 540 paintBoxDecorationBackground(paintInfo, paintOffset); |
| 548 | 541 |
| 549 paintContents(paintInfo, paintOffset); | 542 paintContents(paintInfo, paintOffset); |
| 550 paintSelection(paintInfo, paintOffset); // Fill in gaps in selection on line
s and between blocks. | 543 paintSelection(paintInfo, paintOffset); // Fill in gaps in selection on line
s and between blocks. |
| 551 | 544 |
| 552 if (style()->hasOutline() && !style()->outlineStyleIsAuto()) | 545 if (style()->hasOutline() && !style()->outlineStyleIsAuto()) |
| 553 paintOutline(paintInfo, LayoutRect(paintOffset, size())); | 546 paintOutline(paintInfo, LayoutRect(paintOffset, size())); |
| 554 | 547 |
| 555 paintCarets(paintInfo, paintOffset); | 548 paintCarets(paintInfo, paintOffset); |
| (...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1800 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 1793 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 1801 { | 1794 { |
| 1802 showRenderObject(); | 1795 showRenderObject(); |
| 1803 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 1796 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 1804 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 1797 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 1805 } | 1798 } |
| 1806 | 1799 |
| 1807 #endif | 1800 #endif |
| 1808 | 1801 |
| 1809 } // namespace blink | 1802 } // namespace blink |
| OLD | NEW |