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

Side by Side Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 24077007: Add support for the object-position CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master again 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 | « Source/core/rendering/style/StyleRareNonInheritedData.h ('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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 30 matching lines...) Expand all
41 , m_draggableRegionMode(DraggableRegionNone) 41 , m_draggableRegionMode(DraggableRegionNone)
42 , m_mask(FillLayer(MaskFillLayer)) 42 , m_mask(FillLayer(MaskFillLayer))
43 , m_pageSize() 43 , m_pageSize()
44 , m_shapeInside(RenderStyle::initialShapeInside()) 44 , m_shapeInside(RenderStyle::initialShapeInside())
45 , m_shapeOutside(RenderStyle::initialShapeOutside()) 45 , m_shapeOutside(RenderStyle::initialShapeOutside())
46 , m_shapeMargin(RenderStyle::initialShapeMargin()) 46 , m_shapeMargin(RenderStyle::initialShapeMargin())
47 , m_shapePadding(RenderStyle::initialShapePadding()) 47 , m_shapePadding(RenderStyle::initialShapePadding())
48 , m_clipPath(RenderStyle::initialClipPath()) 48 , m_clipPath(RenderStyle::initialClipPath())
49 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 49 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
50 , m_order(RenderStyle::initialOrder()) 50 , m_order(RenderStyle::initialOrder())
51 , m_objectPosition(RenderStyle::initialObjectPosition())
51 , m_flowThread(RenderStyle::initialFlowThread()) 52 , m_flowThread(RenderStyle::initialFlowThread())
52 , m_regionThread(RenderStyle::initialRegionThread()) 53 , m_regionThread(RenderStyle::initialRegionThread())
53 , m_regionFragment(RenderStyle::initialRegionFragment()) 54 , m_regionFragment(RenderStyle::initialRegionFragment())
54 , m_regionBreakAfter(RenderStyle::initialPageBreak()) 55 , m_regionBreakAfter(RenderStyle::initialPageBreak())
55 , m_regionBreakBefore(RenderStyle::initialPageBreak()) 56 , m_regionBreakBefore(RenderStyle::initialPageBreak())
56 , m_regionBreakInside(RenderStyle::initialPageBreak()) 57 , m_regionBreakInside(RenderStyle::initialPageBreak())
57 , m_pageSizeType(PAGE_SIZE_AUTO) 58 , m_pageSizeType(PAGE_SIZE_AUTO)
58 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 59 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
59 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 60 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
60 , m_alignContent(RenderStyle::initialAlignContent()) 61 , m_alignContent(RenderStyle::initialAlignContent())
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 , m_clipPath(o.m_clipPath) 116 , m_clipPath(o.m_clipPath)
116 , m_textDecorationColor(o.m_textDecorationColor) 117 , m_textDecorationColor(o.m_textDecorationColor)
117 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) 118 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
118 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 119 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
119 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) 120 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
120 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor) 121 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
121 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor) 122 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
122 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor) 123 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
123 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor) 124 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
124 , m_order(o.m_order) 125 , m_order(o.m_order)
126 , m_objectPosition(o.m_objectPosition)
125 , m_flowThread(o.m_flowThread) 127 , m_flowThread(o.m_flowThread)
126 , m_regionThread(o.m_regionThread) 128 , m_regionThread(o.m_regionThread)
127 , m_regionFragment(o.m_regionFragment) 129 , m_regionFragment(o.m_regionFragment)
128 , m_regionBreakAfter(o.m_regionBreakAfter) 130 , m_regionBreakAfter(o.m_regionBreakAfter)
129 , m_regionBreakBefore(o.m_regionBreakBefore) 131 , m_regionBreakBefore(o.m_regionBreakBefore)
130 , m_regionBreakInside(o.m_regionBreakInside) 132 , m_regionBreakInside(o.m_regionBreakInside)
131 , m_pageSizeType(o.m_pageSizeType) 133 , m_pageSizeType(o.m_pageSizeType)
132 , m_transformStyle3D(o.m_transformStyle3D) 134 , m_transformStyle3D(o.m_transformStyle3D)
133 , m_backfaceVisibility(o.m_backfaceVisibility) 135 , m_backfaceVisibility(o.m_backfaceVisibility)
134 , m_alignContent(o.m_alignContent) 136 , m_alignContent(o.m_alignContent)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 && m_clipPath == o.m_clipPath 194 && m_clipPath == o.m_clipPath
193 && m_textDecorationColor == o.m_textDecorationColor 195 && m_textDecorationColor == o.m_textDecorationColor
194 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r 196 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r
195 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 197 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
196 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 198 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
197 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor 199 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
198 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor 200 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
199 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor 201 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
200 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor 202 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
201 && m_order == o.m_order 203 && m_order == o.m_order
204 && m_objectPosition == o.m_objectPosition
202 && m_flowThread == o.m_flowThread 205 && m_flowThread == o.m_flowThread
203 && m_regionThread == o.m_regionThread 206 && m_regionThread == o.m_regionThread
204 && m_regionFragment == o.m_regionFragment 207 && m_regionFragment == o.m_regionFragment
205 && m_regionBreakAfter == o.m_regionBreakAfter 208 && m_regionBreakAfter == o.m_regionBreakAfter
206 && m_regionBreakBefore == o.m_regionBreakBefore 209 && m_regionBreakBefore == o.m_regionBreakBefore
207 && m_regionBreakInside == o.m_regionBreakInside 210 && m_regionBreakInside == o.m_regionBreakInside
208 && m_pageSizeType == o.m_pageSizeType 211 && m_pageSizeType == o.m_pageSizeType
209 && m_transformStyle3D == o.m_transformStyle3D 212 && m_transformStyle3D == o.m_transformStyle3D
210 && m_backfaceVisibility == o.m_backfaceVisibility 213 && m_backfaceVisibility == o.m_backfaceVisibility
211 && m_alignContent == o.m_alignContent 214 && m_alignContent == o.m_alignContent
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 return false; 293 return false;
291 return true; 294 return true;
292 } 295 }
293 296
294 bool StyleRareNonInheritedData::hasFilters() const 297 bool StyleRareNonInheritedData::hasFilters() const
295 { 298 {
296 return m_filter.get() && !m_filter->m_operations.isEmpty(); 299 return m_filter.get() && !m_filter->m_operations.isEmpty();
297 } 300 }
298 301
299 } // namespace WebCore 302 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698