| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 focused_ = flag; | 757 focused_ = flag; |
| 758 | 758 |
| 759 FocusedOrActiveStateChanged(); | 759 FocusedOrActiveStateChanged(); |
| 760 } | 760 } |
| 761 | 761 |
| 762 bool FrameSelection::IsFocusedAndActive() const { | 762 bool FrameSelection::IsFocusedAndActive() const { |
| 763 return focused_ && frame_->GetPage() && | 763 return focused_ && frame_->GetPage() && |
| 764 frame_->GetPage()->GetFocusController().IsActive(); | 764 frame_->GetPage()->GetFocusController().IsActive(); |
| 765 } | 765 } |
| 766 | 766 |
| 767 bool FrameSelection::IsAppearanceDirty() const { | 767 bool FrameSelection::NeedsLayoutSelectionUpdate() const { |
| 768 return layout_selection_->HasPendingSelection(); | 768 return layout_selection_->HasPendingSelection(); |
| 769 } | 769 } |
| 770 | 770 |
| 771 void FrameSelection::CommitAppearanceIfNeeded(LayoutView& layout_view) { | 771 void FrameSelection::CommitAppearanceIfNeeded(LayoutView& layout_view) { |
| 772 return layout_selection_->Commit(layout_view); | 772 return layout_selection_->Commit(layout_view); |
| 773 } | 773 } |
| 774 | 774 |
| 775 void FrameSelection::DidLayout() { | 775 void FrameSelection::DidLayout() { |
| 776 UpdateAppearance(); | 776 UpdateAppearance(); |
| 777 } | 777 } |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1162 } | 1162 } |
| 1163 | 1163 |
| 1164 void showTree(const blink::FrameSelection* sel) { | 1164 void showTree(const blink::FrameSelection* sel) { |
| 1165 if (sel) | 1165 if (sel) |
| 1166 sel->ShowTreeForThis(); | 1166 sel->ShowTreeForThis(); |
| 1167 else | 1167 else |
| 1168 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; | 1168 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; |
| 1169 } | 1169 } |
| 1170 | 1170 |
| 1171 #endif | 1171 #endif |
| OLD | NEW |