| 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 if (!root) | 252 if (!root) |
| 253 return false; | 253 return false; |
| 254 | 254 |
| 255 Element* focusedElement = root->document().focusedElement(); | 255 Element* focusedElement = root->document().focusedElement(); |
| 256 if (!focusedElement) | 256 if (!focusedElement) |
| 257 return false; | 257 return false; |
| 258 | 258 |
| 259 return focusedElement->isShadowIncludingInclusiveAncestorOf(caretPosition().
position().anchorNode()); | 259 return focusedElement->isShadowIncludingInclusiveAncestorOf(caretPosition().
position().anchorNode()); |
| 260 } | 260 } |
| 261 | 261 |
| 262 void FrameCaret::caretBlinkTimerFired(Timer<FrameCaret>*) | 262 void FrameCaret::caretBlinkTimerFired(TimerBase*) |
| 263 { | 263 { |
| 264 DCHECK(caretIsVisible()); | 264 DCHECK(caretIsVisible()); |
| 265 if (isCaretBlinkingSuspended() && m_shouldPaintCaret) | 265 if (isCaretBlinkingSuspended() && m_shouldPaintCaret) |
| 266 return; | 266 return; |
| 267 m_shouldPaintCaret = !m_shouldPaintCaret; | 267 m_shouldPaintCaret = !m_shouldPaintCaret; |
| 268 setCaretRectNeedsUpdate(); | 268 setCaretRectNeedsUpdate(); |
| 269 } | 269 } |
| 270 | 270 |
| 271 } // nemaspace blink | 271 } // nemaspace blink |
| OLD | NEW |