| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()) | 100 , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()) |
| 101 , m_previousCaretVisibility(CaretVisibility::Hidden) | 101 , m_previousCaretVisibility(CaretVisibility::Hidden) |
| 102 , m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired) | 102 , m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired) |
| 103 , m_caretRectDirty(true) | 103 , m_caretRectDirty(true) |
| 104 , m_shouldPaintCaret(true) | 104 , m_shouldPaintCaret(true) |
| 105 , m_isCaretBlinkingSuspended(false) | 105 , m_isCaretBlinkingSuspended(false) |
| 106 , m_focused(frame && frame->page() && frame->page()->focusController().focus
edFrame() == frame) | 106 , m_focused(frame && frame->page() && frame->page()->focusController().focus
edFrame() == frame) |
| 107 , m_shouldShowBlockCursor(false) | 107 , m_shouldShowBlockCursor(false) |
| 108 , m_caretBase(adoptPtr(new CaretBase)) | 108 , m_caretBase(adoptPtr(new CaretBase)) |
| 109 { | 109 { |
| 110 // TODO(yosin): We should remove null check for |m_frame| in |
| 111 // "FrameSelection.cpp", since it never be null. |
| 112 DCHECK(frame); |
| 110 if (shouldAlwaysUseDirectionalSelection(m_frame)) | 113 if (shouldAlwaysUseDirectionalSelection(m_frame)) |
| 111 m_selectionEditor->setIsDirectional(true); | 114 m_selectionEditor->setIsDirectional(true); |
| 112 } | 115 } |
| 113 | 116 |
| 114 FrameSelection::~FrameSelection() | 117 FrameSelection::~FrameSelection() |
| 115 { | 118 { |
| 116 } | 119 } |
| 117 | 120 |
| 118 template <> | 121 template <> |
| 119 VisiblePosition FrameSelection::originalBase<EditingStrategy>() const | 122 VisiblePosition FrameSelection::originalBase<EditingStrategy>() const |
| (...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1445 | 1448 |
| 1446 void showTree(const blink::FrameSelection* sel) | 1449 void showTree(const blink::FrameSelection* sel) |
| 1447 { | 1450 { |
| 1448 if (sel) | 1451 if (sel) |
| 1449 sel->showTreeForThis(); | 1452 sel->showTreeForThis(); |
| 1450 else | 1453 else |
| 1451 fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n"); | 1454 fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n"); |
| 1452 } | 1455 } |
| 1453 | 1456 |
| 1454 #endif | 1457 #endif |
| OLD | NEW |