OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 2805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2816 | 2816 |
2817 void LocalFrameView::UpdateDocumentAnnotatedRegions() const { | 2817 void LocalFrameView::UpdateDocumentAnnotatedRegions() const { |
2818 Document* document = frame_->GetDocument(); | 2818 Document* document = frame_->GetDocument(); |
2819 if (!document->HasAnnotatedRegions()) | 2819 if (!document->HasAnnotatedRegions()) |
2820 return; | 2820 return; |
2821 Vector<AnnotatedRegionValue> new_regions; | 2821 Vector<AnnotatedRegionValue> new_regions; |
2822 CollectAnnotatedRegions(*(document->GetLayoutBox()), new_regions); | 2822 CollectAnnotatedRegions(*(document->GetLayoutBox()), new_regions); |
2823 if (new_regions == document->AnnotatedRegions()) | 2823 if (new_regions == document->AnnotatedRegions()) |
2824 return; | 2824 return; |
2825 document->SetAnnotatedRegions(new_regions); | 2825 document->SetAnnotatedRegions(new_regions); |
2826 if (Page* page = frame_->GetPage()) | 2826 if (frame_->Client()) |
dcheng
2017/06/07 20:22:35
I strongly suspect that this should be a DCHECK--t
Łukasz Anforowicz
2017/06/08 16:29:24
Done (I've also added a comment - please shout if
| |
2827 page->GetChromeClient().AnnotatedRegionsChanged(); | 2827 frame_->Client()->AnnotatedRegionsChanged(); |
2828 } | 2828 } |
2829 | 2829 |
2830 void LocalFrameView::DidAttachDocument() { | 2830 void LocalFrameView::DidAttachDocument() { |
2831 Page* page = frame_->GetPage(); | 2831 Page* page = frame_->GetPage(); |
2832 DCHECK(page); | 2832 DCHECK(page); |
2833 | 2833 |
2834 DCHECK(frame_->GetDocument()); | 2834 DCHECK(frame_->GetDocument()); |
2835 | 2835 |
2836 if (frame_->IsMainFrame()) { | 2836 if (frame_->IsMainFrame()) { |
2837 ScrollableArea& visual_viewport = frame_->GetPage()->GetVisualViewport(); | 2837 ScrollableArea& visual_viewport = frame_->GetPage()->GetVisualViewport(); |
(...skipping 2561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5399 void LocalFrameView::SetAnimationHost( | 5399 void LocalFrameView::SetAnimationHost( |
5400 std::unique_ptr<CompositorAnimationHost> host) { | 5400 std::unique_ptr<CompositorAnimationHost> host) { |
5401 animation_host_ = std::move(host); | 5401 animation_host_ = std::move(host); |
5402 } | 5402 } |
5403 | 5403 |
5404 LayoutUnit LocalFrameView::CaretWidth() const { | 5404 LayoutUnit LocalFrameView::CaretWidth() const { |
5405 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); | 5405 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); |
5406 } | 5406 } |
5407 | 5407 |
5408 } // namespace blink | 5408 } // namespace blink |
OLD | NEW |