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

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

Issue 2802903002: Move PrintBrowser from SPV2 to SPV1 (Closed)
Patch Set: Only call PrintContext::end() if we are exiting Print mode not PrintBrowser mode Created 3 years, 8 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 2948 matching lines...) Expand 10 before | Expand all | Expand 10 after
2959 FloatRect pageRect(0, 0, kA4PortraitPageWidth, kA4PortraitPageHeight); 2959 FloatRect pageRect(0, 0, kA4PortraitPageWidth, kA4PortraitPageHeight);
2960 m_printContext->begin(pageRect.width(), pageRect.height()); 2960 m_printContext->begin(pageRect.width(), pageRect.height());
2961 float height; 2961 float height;
2962 m_printContext->computePageRects(pageRect, 0, 0, 1.0, height); 2962 m_printContext->computePageRects(pageRect, 0, 0, 1.0, height);
2963 dispatchEventsForPrintingOnAllFrames(); 2963 dispatchEventsForPrintingOnAllFrames();
2964 } 2964 }
2965 2965
2966 void FrameView::clearPrintContext() { 2966 void FrameView::clearPrintContext() {
2967 if (!m_printContext) 2967 if (!m_printContext)
2968 return; 2968 return;
2969 m_printContext->end();
pdr. 2017/04/10 00:24:34 Did you mean to remove this? I think we still want
2970 m_printContext.clear(); 2969 m_printContext.clear();
2971 } 2970 }
2972 2971
2973 // TODO(leviw): We don't assert lifecycle information from documents in child 2972 // TODO(leviw): We don't assert lifecycle information from documents in child
2974 // PluginViews. 2973 // PluginViews.
2975 void FrameView::updateLifecyclePhasesInternal( 2974 void FrameView::updateLifecyclePhasesInternal(
2976 DocumentLifecycle::LifecycleState targetState) { 2975 DocumentLifecycle::LifecycleState targetState) {
2977 if (m_currentUpdateLifecyclePhasesTargetState != 2976 if (m_currentUpdateLifecyclePhasesTargetState !=
2978 DocumentLifecycle::Uninitialized) { 2977 DocumentLifecycle::Uninitialized) {
2979 NOTREACHED() << "FrameView::updateLifecyclePhasesInternal() reentrance"; 2978 NOTREACHED() << "FrameView::updateLifecyclePhasesInternal() reentrance";
(...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after
5241 void FrameView::setAnimationHost( 5240 void FrameView::setAnimationHost(
5242 std::unique_ptr<CompositorAnimationHost> host) { 5241 std::unique_ptr<CompositorAnimationHost> host) {
5243 m_animationHost = std::move(host); 5242 m_animationHost = std::move(host);
5244 } 5243 }
5245 5244
5246 LayoutUnit FrameView::caretWidth() const { 5245 LayoutUnit FrameView::caretWidth() const {
5247 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5246 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5248 } 5247 }
5249 5248
5250 } // namespace blink 5249 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698