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

Side by Side Diff: sky/engine/core/html/canvas/CanvasRenderingContext2D.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 years, 11 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 | « sky/engine/core/html/HTMLImageElement.cpp ('k') | sky/engine/core/page/EventHandler.cpp » ('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 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 scrollPathIntoViewInternal(path2d->path()); 1088 scrollPathIntoViewInternal(path2d->path());
1089 } 1089 }
1090 1090
1091 void CanvasRenderingContext2D::scrollPathIntoViewInternal(const Path& path) 1091 void CanvasRenderingContext2D::scrollPathIntoViewInternal(const Path& path)
1092 { 1092 {
1093 RenderObject* renderer = canvas()->renderer(); 1093 RenderObject* renderer = canvas()->renderer();
1094 RenderBox* renderBox = canvas()->renderBox(); 1094 RenderBox* renderBox = canvas()->renderBox();
1095 if (!renderer || !renderBox || !state().m_invertibleCTM || path.isEmpty()) 1095 if (!renderer || !renderBox || !state().m_invertibleCTM || path.isEmpty())
1096 return; 1096 return;
1097 1097
1098 canvas()->document().updateLayoutIgnorePendingStylesheets(); 1098 canvas()->document().updateLayout();
1099 1099
1100 // Apply transformation and get the bounding rect 1100 // Apply transformation and get the bounding rect
1101 Path transformedPath = path; 1101 Path transformedPath = path;
1102 transformedPath.transform(state().m_transform); 1102 transformedPath.transform(state().m_transform);
1103 FloatRect boundingRect = transformedPath.boundingRect(); 1103 FloatRect boundingRect = transformedPath.boundingRect();
1104 1104
1105 // Offset by the canvas rect 1105 // Offset by the canvas rect
1106 LayoutRect pathRect(boundingRect); 1106 LayoutRect pathRect(boundingRect);
1107 IntRect canvasRect = renderBox->absoluteContentBox(); 1107 IntRect canvasRect = renderBox->absoluteContentBox();
1108 pathRect.move(canvasRect.x(), canvasRect.y()); 1108 pathRect.move(canvasRect.x(), canvasRect.y());
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
2244 2244
2245 unsigned CanvasRenderingContext2D::hitRegionsCount() const 2245 unsigned CanvasRenderingContext2D::hitRegionsCount() const
2246 { 2246 {
2247 if (m_hitRegionManager) 2247 if (m_hitRegionManager)
2248 return m_hitRegionManager->getHitRegionsCount(); 2248 return m_hitRegionManager->getHitRegionsCount();
2249 2249
2250 return 0; 2250 return 0;
2251 } 2251 }
2252 2252
2253 } // namespace blink 2253 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/html/HTMLImageElement.cpp ('k') | sky/engine/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698