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

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

Issue 787293002: Remove the straggling DisableCompositingQueryAsserts. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/frame/FrameView.cpp ('k') | sky/engine/core/rendering/RenderBox.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 if (hasOverflowClip()) { 243 if (hasOverflowClip()) {
244 // Adjust the paint invalidation rect for scroll offset 244 // Adjust the paint invalidation rect for scroll offset
245 paintInvalidationRect.move(-scrolledContentOffset()); 245 paintInvalidationRect.move(-scrolledContentOffset());
246 246
247 // Don't allow this rect to spill out of our overflow box. 247 // Don't allow this rect to spill out of our overflow box.
248 paintInvalidationRect.intersect(LayoutRect(LayoutPoint(), size())); 248 paintInvalidationRect.intersect(LayoutRect(LayoutPoint(), size()));
249 } 249 }
250 250
251 // Make sure the rect is still non-empty after intersecting for overflow abo ve 251 // Make sure the rect is still non-empty after intersecting for overflow abo ve
252 if (!paintInvalidationRect.isEmpty()) { 252 if (!paintInvalidationRect.isEmpty()) {
253 // Hits in media/event-attributes.html
254 DisableCompositingQueryAsserts disabler;
255
256 invalidatePaintRectangle(paintInvalidationRect); // We need to do a part ial paint invalidation of our content. 253 invalidatePaintRectangle(paintInvalidationRect); // We need to do a part ial paint invalidation of our content.
257 } 254 }
258 255
259 m_paintInvalidationLogicalTop = 0; 256 m_paintInvalidationLogicalTop = 0;
260 m_paintInvalidationLogicalBottom = 0; 257 m_paintInvalidationLogicalBottom = 0;
261 } 258 }
262 259
263 LayoutUnit RenderBlockFlow::logicalLeftSelectionOffset(RenderBlock* rootBlock, L ayoutUnit position) 260 LayoutUnit RenderBlockFlow::logicalLeftSelectionOffset(RenderBlock* rootBlock, L ayoutUnit position)
264 { 261 {
265 LayoutUnit logicalLeft = logicalLeftOffsetForLine(false); 262 LayoutUnit logicalLeft = logicalLeftOffsetForLine(false);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); 401 float logicalLeft = logicalLeftOffsetForLine(false).toFloat();
405 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft ; 402 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft ;
406 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0); 403 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid th, availableLogicalWidth, 0);
407 404
408 if (!style()->isLeftToRightDirection()) 405 if (!style()->isLeftToRightDirection())
409 return logicalWidth() - logicalLeft; 406 return logicalWidth() - logicalLeft;
410 return logicalLeft; 407 return logicalLeft;
411 } 408 }
412 409
413 } // namespace blink 410 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/frame/FrameView.cpp ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698