| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 } | 430 } |
| 431 | 431 |
| 432 bool RenderBlock::hasCaret() const | 432 bool RenderBlock::hasCaret() const |
| 433 { | 433 { |
| 434 return hasCursorCaret(frame()->selection(), this) | 434 return hasCursorCaret(frame()->selection(), this) |
| 435 || hasDragCaret(frame()->page()->dragCaretController(), this); | 435 || hasDragCaret(frame()->page()->dragCaretController(), this); |
| 436 } | 436 } |
| 437 | 437 |
| 438 void RenderBlock::paintCarets(PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) | 438 void RenderBlock::paintCarets(PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) |
| 439 { | 439 { |
| 440 if (!frame()) |
| 441 return; |
| 440 FrameSelection& selection = frame()->selection(); | 442 FrameSelection& selection = frame()->selection(); |
| 441 if (hasCursorCaret(selection, this)) { | 443 if (hasCursorCaret(selection, this)) { |
| 442 selection.paintCaret(paintInfo.context, paintOffset, paintInfo.rect); | 444 selection.paintCaret(paintInfo.context, paintOffset, paintInfo.rect); |
| 443 } | 445 } |
| 444 | 446 |
| 445 DragCaretController& dragCaretController = frame()->page()->dragCaretControl
ler(); | 447 DragCaretController& dragCaretController = frame()->page()->dragCaretControl
ler(); |
| 446 if (hasDragCaret(dragCaretController, this)) { | 448 if (hasDragCaret(dragCaretController, this)) { |
| 447 dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffs
et, paintInfo.rect); | 449 dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffs
et, paintInfo.rect); |
| 448 } | 450 } |
| 449 } | 451 } |
| (...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1671 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 1673 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 1672 { | 1674 { |
| 1673 showRenderObject(); | 1675 showRenderObject(); |
| 1674 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 1676 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 1675 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 1677 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 1676 } | 1678 } |
| 1677 | 1679 |
| 1678 #endif | 1680 #endif |
| 1679 | 1681 |
| 1680 } // namespace blink | 1682 } // namespace blink |
| OLD | NEW |