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

Side by Side Diff: Source/core/html/canvas/CanvasRenderingContext2D.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLWBRElement.cpp ('k') | Source/core/html/forms/BaseButtonInputType.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
10 * 10 *
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 scrollPathIntoViewInternal(m_path); 1180 scrollPathIntoViewInternal(m_path);
1181 } 1181 }
1182 1182
1183 void CanvasRenderingContext2D::scrollPathIntoView(Path2D* path2d) 1183 void CanvasRenderingContext2D::scrollPathIntoView(Path2D* path2d)
1184 { 1184 {
1185 scrollPathIntoViewInternal(path2d->path()); 1185 scrollPathIntoViewInternal(path2d->path());
1186 } 1186 }
1187 1187
1188 void CanvasRenderingContext2D::scrollPathIntoViewInternal(const Path& path) 1188 void CanvasRenderingContext2D::scrollPathIntoViewInternal(const Path& path)
1189 { 1189 {
1190 RenderObject* renderer = canvas()->renderer(); 1190 LayoutObject* renderer = canvas()->renderer();
1191 RenderBox* renderBox = canvas()->renderBox(); 1191 RenderBox* renderBox = canvas()->renderBox();
1192 if (!renderer || !renderBox || !state().m_invertibleCTM || path.isEmpty()) 1192 if (!renderer || !renderBox || !state().m_invertibleCTM || path.isEmpty())
1193 return; 1193 return;
1194 1194
1195 canvas()->document().updateLayoutIgnorePendingStylesheets(); 1195 canvas()->document().updateLayoutIgnorePendingStylesheets();
1196 1196
1197 // Apply transformation and get the bounding rect 1197 // Apply transformation and get the bounding rect
1198 Path transformedPath = path; 1198 Path transformedPath = path;
1199 transformedPath.transform(state().m_transform); 1199 transformedPath.transform(state().m_transform);
1200 FloatRect boundingRect = transformedPath.boundingRect(); 1200 FloatRect boundingRect = transformedPath.boundingRect();
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 2362
2363 unsigned CanvasRenderingContext2D::hitRegionsCount() const 2363 unsigned CanvasRenderingContext2D::hitRegionsCount() const
2364 { 2364 {
2365 if (m_hitRegionManager) 2365 if (m_hitRegionManager)
2366 return m_hitRegionManager->getHitRegionsCount(); 2366 return m_hitRegionManager->getHitRegionsCount();
2367 2367
2368 return 0; 2368 return 0;
2369 } 2369 }
2370 2370
2371 } // namespace blink 2371 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLWBRElement.cpp ('k') | Source/core/html/forms/BaseButtonInputType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698