OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 ASSERT(!hasAcceleratedCompositing()); | 290 ASSERT(!hasAcceleratedCompositing()); |
291 | 291 |
292 if (updateType >= CompositingUpdateAfterCompositingInputChange) | 292 if (updateType >= CompositingUpdateAfterCompositingInputChange) |
293 CompositingInputsUpdater(rootRenderLayer()).update(); | 293 CompositingInputsUpdater(rootRenderLayer()).update(); |
294 | 294 |
295 #if ENABLE(ASSERT) | 295 #if ENABLE(ASSERT) |
296 CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(root
RenderLayer()); | 296 CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(root
RenderLayer()); |
297 #endif | 297 #endif |
298 } | 298 } |
299 | 299 |
300 static void forceRecomputePaintInvalidationRectsIncludingNonCompositingDescendan
ts(RenderObject* renderer) | |
301 { | |
302 // We clear the previous paint invalidation rect as it's wrong (paint invali
ation container | |
303 // changed, ...). Forcing a full invalidation will make us recompute it. Als
o we are not | |
304 // changing the previous position from our paint invalidation container, whi
ch is fine as | |
305 // we want a full paint invalidation anyway. | |
306 renderer->setPreviousPaintInvalidationRect(LayoutRect()); | |
307 renderer->setShouldDoFullPaintInvalidation(); | |
308 | |
309 for (RenderObject* child = renderer->slowFirstChild(); child; child = child-
>nextSibling()) { | |
310 if (!child->isPaintInvalidationContainer()) | |
311 forceRecomputePaintInvalidationRectsIncludingNonCompositingDescendan
ts(child); | |
312 } | |
313 } | |
314 | |
315 | |
316 void RenderLayerCompositor::updateIfNeeded() | 300 void RenderLayerCompositor::updateIfNeeded() |
317 { | 301 { |
318 CompositingUpdateType updateType = m_pendingUpdateType; | 302 CompositingUpdateType updateType = m_pendingUpdateType; |
319 m_pendingUpdateType = CompositingUpdateNone; | 303 m_pendingUpdateType = CompositingUpdateNone; |
320 | 304 |
321 if (!hasAcceleratedCompositing()) { | 305 if (!hasAcceleratedCompositing()) { |
322 updateWithoutAcceleratedCompositing(updateType); | 306 updateWithoutAcceleratedCompositing(updateType); |
323 return; | 307 return; |
324 } | 308 } |
325 | 309 |
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1188 } else if (graphicsLayer == m_scrollLayer.get()) { | 1172 } else if (graphicsLayer == m_scrollLayer.get()) { |
1189 name = "LocalFrame Scrolling Layer"; | 1173 name = "LocalFrame Scrolling Layer"; |
1190 } else { | 1174 } else { |
1191 ASSERT_NOT_REACHED(); | 1175 ASSERT_NOT_REACHED(); |
1192 } | 1176 } |
1193 | 1177 |
1194 return name; | 1178 return name; |
1195 } | 1179 } |
1196 | 1180 |
1197 } // namespace blink | 1181 } // namespace blink |
OLD | NEW |