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

Side by Side Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 680703002: Remove more frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/frame/PinchViewport.cpp ('k') | sky/engine/platform/scroll/ScrollAnimator.h » ('j') | 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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 bool restrictedByLineClamp = false; 401 bool restrictedByLineClamp = false;
402 if (parent()) { 402 if (parent()) {
403 parentBox = parent()->enclosingBox(); 403 parentBox = parent()->enclosingBox();
404 restrictedByLineClamp = !parent()->style()->lineClamp().isNone(); 404 restrictedByLineClamp = !parent()->style()->lineClamp().isNone();
405 } 405 }
406 406
407 if (hasOverflowClip() && !restrictedByLineClamp) { 407 if (hasOverflowClip() && !restrictedByLineClamp) {
408 // Don't scroll to reveal an overflow layer that is restricted by the -w ebkit-line-clamp property. 408 // Don't scroll to reveal an overflow layer that is restricted by the -w ebkit-line-clamp property.
409 // This will prevent us from revealing text hidden by the slider in Safa ri RSS. 409 // This will prevent us from revealing text hidden by the slider in Safa ri RSS.
410 newRect = layer()->scrollableArea()->exposeRect(rect, alignX, alignY); 410 newRect = layer()->scrollableArea()->exposeRect(rect, alignX, alignY);
411 } else if (!parentBox && canBeProgramaticallyScrolled()) {
412 if (FrameView* frameView = this->frameView()) {
413 LayoutRect viewRect = frameView->visibleContentRect();
414 LayoutRect r = ScrollAlignment::getRectToExpose(viewRect, rect, alig nX, alignY);
415 frameView->setScrollPosition(roundedIntPoint(r.location()));
416 }
417 } 411 }
418 412
419 if (frame()->page()->autoscrollController().autoscrollInProgress()) 413 if (frame()->page()->autoscrollController().autoscrollInProgress())
420 parentBox = enclosingScrollableBox(); 414 parentBox = enclosingScrollableBox();
421 415
422 if (parentBox) 416 if (parentBox)
423 parentBox->scrollRectToVisible(newRect, alignX, alignY); 417 parentBox->scrollRectToVisible(newRect, alignX, alignY);
424 } 418 }
425 419
426 void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumul atedOffset) const 420 void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumul atedOffset) const
(...skipping 3788 matching lines...) Expand 10 before | Expand all | Expand 10 after
4215 4209
4216 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 4210 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
4217 { 4211 {
4218 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor); 4212 backgroundColor = style.visitedDependentColor(CSSPropertyBackgroundColor);
4219 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 4213 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
4220 ASSERT(hasBackground == style.hasBackground()); 4214 ASSERT(hasBackground == style.hasBackground());
4221 hasBorder = style.hasBorder(); 4215 hasBorder = style.hasBorder();
4222 } 4216 }
4223 4217
4224 } // namespace blink 4218 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/frame/PinchViewport.cpp ('k') | sky/engine/platform/scroll/ScrollAnimator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698