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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 23526081: Add NULL check for renderBox::layer() on applying zoom level change (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: grammar fix Created 7 years, 3 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
« no previous file with comments | « LayoutTests/fast/css/zoom-on-nested-scroll-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 && parent() && !parent()->normalChildNeedsLayout()) 247 && parent() && !parent()->normalChildNeedsLayout())
248 parent()->setChildNeedsLayout(); 248 parent()->setChildNeedsLayout();
249 } 249 }
250 250
251 if (RenderBlock::hasPercentHeightContainerMap() && firstChild() 251 if (RenderBlock::hasPercentHeightContainerMap() && firstChild()
252 && oldHorizontalWritingMode != isHorizontalWritingMode()) 252 && oldHorizontalWritingMode != isHorizontalWritingMode())
253 RenderBlock::clearPercentHeightDescendantsFrom(this); 253 RenderBlock::clearPercentHeightDescendantsFrom(this);
254 254
255 // If our zoom factor changes and we have a defined scrollLeft/Top, we need to adjust that value into the 255 // If our zoom factor changes and we have a defined scrollLeft/Top, we need to adjust that value into the
256 // new zoomed coordinate space. 256 // new zoomed coordinate space.
257 if (hasOverflowClip() && oldStyle && newStyle && oldStyle->effectiveZoom() ! = newStyle->effectiveZoom()) { 257 if (hasOverflowClip() && oldStyle && newStyle && oldStyle->effectiveZoom() ! = newStyle->effectiveZoom() && layer()) {
258 if (int left = layer()->scrollXOffset()) { 258 if (int left = layer()->scrollXOffset()) {
259 left = (left / oldStyle->effectiveZoom()) * newStyle->effectiveZoom( ); 259 left = (left / oldStyle->effectiveZoom()) * newStyle->effectiveZoom( );
260 layer()->scrollToXOffset(left); 260 layer()->scrollToXOffset(left);
261 } 261 }
262 if (int top = layer()->scrollYOffset()) { 262 if (int top = layer()->scrollYOffset()) {
263 top = (top / oldStyle->effectiveZoom()) * newStyle->effectiveZoom(); 263 top = (top / oldStyle->effectiveZoom()) * newStyle->effectiveZoom();
264 layer()->scrollToYOffset(top); 264 layer()->scrollToYOffset(top);
265 } 265 }
266 } 266 }
267 267
(...skipping 4473 matching lines...) Expand 10 before | Expand all | Expand 10 after
4741 return 0; 4741 return 0;
4742 4742
4743 if (!layoutState && !flowThreadContainingBlock()) 4743 if (!layoutState && !flowThreadContainingBlock())
4744 return 0; 4744 return 0;
4745 4745
4746 RenderBlock* containerBlock = containingBlock(); 4746 RenderBlock* containerBlock = containingBlock();
4747 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4747 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4748 } 4748 }
4749 4749
4750 } // namespace WebCore 4750 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/zoom-on-nested-scroll-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698