Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrameView.cpp

Issue 2940933003: DO NOT SUBMIT results of new clang-format (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3343 matching lines...) Expand 10 before | Expand all | Expand 10 after
3354 return; 3354 return;
3355 3355
3356 if (!paint_artifact_compositor_) { 3356 if (!paint_artifact_compositor_) {
3357 paint_artifact_compositor_ = PaintArtifactCompositor::Create(); 3357 paint_artifact_compositor_ = PaintArtifactCompositor::Create();
3358 page->GetChromeClient().AttachRootLayer( 3358 page->GetChromeClient().AttachRootLayer(
3359 paint_artifact_compositor_->GetWebLayer(), &GetFrame()); 3359 paint_artifact_compositor_->GetWebLayer(), &GetFrame());
3360 } 3360 }
3361 3361
3362 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime"); 3362 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
3363 3363
3364 paint_artifact_compositor_->Update( 3364 paint_artifact_compositor_->Update(paint_controller_->GetPaintArtifact(),
3365 paint_controller_->GetPaintArtifact(), 3365 is_storing_composited_layer_debug_info_,
3366 is_storing_composited_layer_debug_info_, composited_element_ids); 3366 composited_element_ids);
3367 } 3367 }
3368 3368
3369 std::unique_ptr<JSONObject> LocalFrameView::CompositedLayersAsJSON( 3369 std::unique_ptr<JSONObject> LocalFrameView::CompositedLayersAsJSON(
3370 LayerTreeFlags flags) { 3370 LayerTreeFlags flags) {
3371 return GetFrame() 3371 return GetFrame()
3372 .LocalFrameRoot() 3372 .LocalFrameRoot()
3373 .View() 3373 .View()
3374 ->paint_artifact_compositor_->LayersAsJSON(flags); 3374 ->paint_artifact_compositor_->LayersAsJSON(flags);
3375 } 3375 }
3376 3376
(...skipping 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after
5420 void LocalFrameView::SetAnimationHost( 5420 void LocalFrameView::SetAnimationHost(
5421 std::unique_ptr<CompositorAnimationHost> host) { 5421 std::unique_ptr<CompositorAnimationHost> host) {
5422 animation_host_ = std::move(host); 5422 animation_host_ = std::move(host);
5423 } 5423 }
5424 5424
5425 LayoutUnit LocalFrameView::CaretWidth() const { 5425 LayoutUnit LocalFrameView::CaretWidth() const {
5426 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5426 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5427 } 5427 }
5428 5428
5429 } // namespace blink 5429 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698