| 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 | 252 |
| 253 VisibleSelection oldSelection = m_selection; | 253 VisibleSelection oldSelection = m_selection; |
| 254 | 254 |
| 255 m_selection = s; | 255 m_selection = s; |
| 256 setCaretRectNeedsUpdate(); | 256 setCaretRectNeedsUpdate(); |
| 257 | 257 |
| 258 if (!s.isNone() && !(options & DoNotSetFocus)) | 258 if (!s.isNone() && !(options & DoNotSetFocus)) |
| 259 setFocusedNodeIfNeeded(); | 259 setFocusedNodeIfNeeded(); |
| 260 | 260 |
| 261 if (!(options & DoNotUpdateAppearance)) { | 261 if (!(options & DoNotUpdateAppearance)) { |
| 262 // Hits in compositing/overflow/do-not-paint-outline-into-composited-scr
olling-contents.html | |
| 263 DisableCompositingQueryAsserts disabler; | |
| 264 updateAppearance(ResetCaretBlink); | 262 updateAppearance(ResetCaretBlink); |
| 265 } | 263 } |
| 266 | 264 |
| 267 // Always clear the x position used for vertical arrow navigation. | 265 // Always clear the x position used for vertical arrow navigation. |
| 268 // It will be restored by the vertical arrow navigation code if necessary. | 266 // It will be restored by the vertical arrow navigation code if necessary. |
| 269 m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation(); | 267 m_xPosForVerticalArrowNavigation = NoXPosForVerticalArrowNavigation(); |
| 270 selectFrameElementInParentIfFullySelected(); | 268 selectFrameElementInParentIfFullySelected(); |
| 271 notifyRendererOfSelectionChange(userTriggered); | 269 notifyRendererOfSelectionChange(userTriggered); |
| 272 m_frame->editor().respondToChangedSelection(oldSelection, options); | 270 m_frame->editor().respondToChangedSelection(oldSelection, options); |
| 273 if (userTriggered == UserTriggered) { | 271 if (userTriggered == UserTriggered) { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 if (endPosition.isNotNull()) | 481 if (endPosition.isNotNull()) |
| 484 endPosition.getInlineBoxAndOffset(endBox, unusedOffset); | 482 endPosition.getInlineBoxAndOffset(endBox, unusedOffset); |
| 485 if (startBox && endBox && startBox->direction() == endBox->direction()) | 483 if (startBox && endBox && startBox->direction() == endBox->direction()) |
| 486 return startBox->direction(); | 484 return startBox->direction(); |
| 487 | 485 |
| 488 return directionOfEnclosingBlock(); | 486 return directionOfEnclosingBlock(); |
| 489 } | 487 } |
| 490 | 488 |
| 491 void FrameSelection::didChangeFocus() | 489 void FrameSelection::didChangeFocus() |
| 492 { | 490 { |
| 493 // Hits in virtual/gpu/compositedscrolling/scrollbars/scrollbar-miss-mousemo
ve-disabled.html | |
| 494 DisableCompositingQueryAsserts disabler; | |
| 495 updateAppearance(); | 491 updateAppearance(); |
| 496 } | 492 } |
| 497 | 493 |
| 498 void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direct
ion) | 494 void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direct
ion) |
| 499 { | 495 { |
| 500 if (alter != AlterationExtend) | 496 if (alter != AlterationExtend) |
| 501 return; | 497 return; |
| 502 | 498 |
| 503 Position start = m_selection.start(); | 499 Position start = m_selection.start(); |
| 504 Position end = m_selection.end(); | 500 Position end = m_selection.end(); |
| (...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1720 sel.showTreeForThis(); | 1716 sel.showTreeForThis(); |
| 1721 } | 1717 } |
| 1722 | 1718 |
| 1723 void showTree(const blink::FrameSelection* sel) | 1719 void showTree(const blink::FrameSelection* sel) |
| 1724 { | 1720 { |
| 1725 if (sel) | 1721 if (sel) |
| 1726 sel->showTreeForThis(); | 1722 sel->showTreeForThis(); |
| 1727 } | 1723 } |
| 1728 | 1724 |
| 1729 #endif | 1725 #endif |
| OLD | NEW |