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

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

Issue 678193005: 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
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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 IntSize RenderBox::calculateAutoscrollDirection(const IntPoint& windowPoint) con st 597 IntSize RenderBox::calculateAutoscrollDirection(const IntPoint& windowPoint) con st
598 { 598 {
599 if (!frame()) 599 if (!frame())
600 return IntSize(); 600 return IntSize();
601 601
602 FrameView* frameView = frame()->view(); 602 FrameView* frameView = frame()->view();
603 if (!frameView) 603 if (!frameView)
604 return IntSize(); 604 return IntSize();
605 605
606 IntRect box(absoluteBoundingBoxRect()); 606 IntRect box(absoluteBoundingBoxRect());
607 box.move(view()->frameView()->scrollOffset());
608 IntRect windowBox = view()->frameView()->contentsToWindow(box); 607 IntRect windowBox = view()->frameView()->contentsToWindow(box);
609 608
610 IntPoint windowAutoscrollPoint = windowPoint; 609 IntPoint windowAutoscrollPoint = windowPoint;
611 610
612 if (windowAutoscrollPoint.x() < windowBox.x() + autoscrollBeltSize) 611 if (windowAutoscrollPoint.x() < windowBox.x() + autoscrollBeltSize)
613 windowAutoscrollPoint.move(-autoscrollBeltSize, 0); 612 windowAutoscrollPoint.move(-autoscrollBeltSize, 0);
614 else if (windowAutoscrollPoint.x() > windowBox.maxX() - autoscrollBeltSize) 613 else if (windowAutoscrollPoint.x() > windowBox.maxX() - autoscrollBeltSize)
615 windowAutoscrollPoint.move(autoscrollBeltSize, 0); 614 windowAutoscrollPoint.move(autoscrollBeltSize, 0);
616 615
617 if (windowAutoscrollPoint.y() < windowBox.y() + autoscrollBeltSize) 616 if (windowAutoscrollPoint.y() < windowBox.y() + autoscrollBeltSize)
(...skipping 3539 matching lines...) Expand 10 before | Expand all | Expand 10 after
4157 4156
4158 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 4157 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
4159 { 4158 {
4160 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 4159 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
4161 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 4160 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
4162 ASSERT(hasBackground == style.hasBackground()); 4161 ASSERT(hasBackground == style.hasBackground());
4163 hasBorder = style.hasBorder(); 4162 hasBorder = style.hasBorder();
4164 } 4163 }
4165 4164
4166 } // namespace blink 4165 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlockFlow.cpp ('k') | sky/engine/core/rendering/compositing/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698