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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
780 | 780 |
781 bool FrameSelection::IsFocusedAndActive() const { | 781 bool FrameSelection::IsFocusedAndActive() const { |
782 return focused_ && frame_->GetPage() && | 782 return focused_ && frame_->GetPage() && |
783 frame_->GetPage()->GetFocusController().IsActive(); | 783 frame_->GetPage()->GetFocusController().IsActive(); |
784 } | 784 } |
785 | 785 |
786 bool FrameSelection::NeedsLayoutSelectionUpdate() const { | 786 bool FrameSelection::NeedsLayoutSelectionUpdate() const { |
787 return layout_selection_->HasPendingSelection(); | 787 return layout_selection_->HasPendingSelection(); |
788 } | 788 } |
789 | 789 |
790 void FrameSelection::CommitAppearanceIfNeeded(LayoutView& layout_view) { | 790 void FrameSelection::CommitAppearanceIfNeeded() { |
791 return layout_selection_->Commit(layout_view); | 791 return layout_selection_->Commit(); |
792 } | 792 } |
793 | 793 |
794 void FrameSelection::DidLayout() { | 794 void FrameSelection::DidLayout() { |
795 // Upon relayout, a hidden selection must be kept hidden and a visible | 795 // Upon relayout, a hidden selection must be kept hidden and a visible |
796 // selection must be kept visible. | 796 // selection must be kept visible. |
797 UpdateAppearance(LayoutSelection::PaintHint::kKeep); | 797 UpdateAppearance(LayoutSelection::PaintHint::kKeep); |
798 } | 798 } |
799 | 799 |
800 void FrameSelection::UpdateAppearance(LayoutSelection::PaintHint hint) { | 800 void FrameSelection::UpdateAppearance(LayoutSelection::PaintHint hint) { |
801 DCHECK(!frame_->ContentLayoutItem().IsNull()); | 801 DCHECK(!frame_->ContentLayoutItem().IsNull()); |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1181 } | 1181 } |
1182 | 1182 |
1183 void showTree(const blink::FrameSelection* sel) { | 1183 void showTree(const blink::FrameSelection* sel) { |
1184 if (sel) | 1184 if (sel) |
1185 sel->ShowTreeForThis(); | 1185 sel->ShowTreeForThis(); |
1186 else | 1186 else |
1187 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; | 1187 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; |
1188 } | 1188 } |
1189 | 1189 |
1190 #endif | 1190 #endif |
OLD | NEW |