| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1000 m_caretBlinkTimer.stop(); | 1000 m_caretBlinkTimer.stop(); |
| 1001 | 1001 |
| 1002 m_shouldPaintCaret = false; | 1002 m_shouldPaintCaret = false; |
| 1003 willNeedCaretRectUpdate = true; | 1003 willNeedCaretRectUpdate = true; |
| 1004 } | 1004 } |
| 1005 | 1005 |
| 1006 // Start blinking with a black caret. Be sure not to restart if we're | 1006 // Start blinking with a black caret. Be sure not to restart if we're |
| 1007 // already blinking in the right location. | 1007 // already blinking in the right location. |
| 1008 if (shouldBlink && !m_caretBlinkTimer.isActive()) { | 1008 if (shouldBlink && !m_caretBlinkTimer.isActive()) { |
| 1009 if (double blinkInterval = LayoutTheme::theme().caretBlinkInterval()) | 1009 if (double blinkInterval = LayoutTheme::theme().caretBlinkInterval()) |
| 1010 m_caretBlinkTimer.startRepeating(blinkInterval, FROM_HERE); | 1010 m_caretBlinkTimer.startRepeating(blinkInterval, BLINK_FROM_HERE); |
| 1011 | 1011 |
| 1012 m_shouldPaintCaret = true; | 1012 m_shouldPaintCaret = true; |
| 1013 willNeedCaretRectUpdate = true; | 1013 willNeedCaretRectUpdate = true; |
| 1014 } | 1014 } |
| 1015 | 1015 |
| 1016 if (willNeedCaretRectUpdate) | 1016 if (willNeedCaretRectUpdate) |
| 1017 setCaretRectNeedsUpdate(); | 1017 setCaretRectNeedsUpdate(); |
| 1018 | 1018 |
| 1019 LayoutView* view = m_frame->contentLayoutObject(); | 1019 LayoutView* view = m_frame->contentLayoutObject(); |
| 1020 if (!view) | 1020 if (!view) |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1409 | 1409 |
| 1410 void showTree(const blink::FrameSelection* sel) | 1410 void showTree(const blink::FrameSelection* sel) |
| 1411 { | 1411 { |
| 1412 if (sel) | 1412 if (sel) |
| 1413 sel->showTreeForThis(); | 1413 sel->showTreeForThis(); |
| 1414 else | 1414 else |
| 1415 fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n"); | 1415 fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n"); |
| 1416 } | 1416 } |
| 1417 | 1417 |
| 1418 #endif | 1418 #endif |
| OLD | NEW |