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

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

Issue 681583002: Remove pinch viewports. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: upload synced patch 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 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/rendering/RenderBox.h" 27 #include "core/rendering/RenderBox.h"
28 28
29 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
30 #include "core/editing/htmlediting.h" 30 #include "core/editing/htmlediting.h"
31 #include "core/frame/FrameHost.h" 31 #include "core/frame/FrameHost.h"
32 #include "core/frame/FrameView.h" 32 #include "core/frame/FrameView.h"
33 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
34 #include "core/frame/PinchViewport.h"
35 #include "core/frame/Settings.h" 34 #include "core/frame/Settings.h"
36 #include "core/html/HTMLElement.h" 35 #include "core/html/HTMLElement.h"
37 #include "core/page/AutoscrollController.h" 36 #include "core/page/AutoscrollController.h"
38 #include "core/page/EventHandler.h" 37 #include "core/page/EventHandler.h"
39 #include "core/page/Page.h" 38 #include "core/page/Page.h"
40 #include "core/rendering/HitTestResult.h" 39 #include "core/rendering/HitTestResult.h"
41 #include "core/rendering/PaintInfo.h" 40 #include "core/rendering/PaintInfo.h"
42 #include "core/rendering/RenderFlexibleBox.h" 41 #include "core/rendering/RenderFlexibleBox.h"
43 #include "core/rendering/RenderGeometryMap.h" 42 #include "core/rendering/RenderGeometryMap.h"
44 #include "core/rendering/RenderGrid.h" 43 #include "core/rendering/RenderGrid.h"
(...skipping 4164 matching lines...) Expand 10 before | Expand all | Expand 10 after
4209 4208
4210 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 4209 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
4211 { 4210 {
4212 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 4211 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
4213 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 4212 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
4214 ASSERT(hasBackground == style.hasBackground()); 4213 ASSERT(hasBackground == style.hasBackground());
4215 hasBorder = style.hasBorder(); 4214 hasBorder = style.hasBorder();
4216 } 4215 }
4217 4216
4218 } // namespace blink 4217 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698