| 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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 } | 326 } |
| 327 } | 327 } |
| 328 | 328 |
| 329 if (layersChanged) | 329 if (layersChanged) |
| 330 updateType = std::max(updateType, CompositingUpdateRebuildTree); | 330 updateType = std::max(updateType, CompositingUpdateRebuildTree); |
| 331 } | 331 } |
| 332 | 332 |
| 333 if (updateType != CompositingUpdateNone) { | 333 if (updateType != CompositingUpdateNone) { |
| 334 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive")
; | 334 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive")
; |
| 335 GraphicsLayerUpdater updater; | 335 GraphicsLayerUpdater updater; |
| 336 updater.update(*updateRoot); | 336 updater.update(layersNeedingRepaint, *updateRoot); |
| 337 | 337 |
| 338 if (updater.needsRebuildTree()) | 338 if (updater.needsRebuildTree()) |
| 339 updateType = std::max(updateType, CompositingUpdateRebuildTree); | 339 updateType = std::max(updateType, CompositingUpdateRebuildTree); |
| 340 | 340 |
| 341 #if ASSERT_ENABLED | 341 #if ASSERT_ENABLED |
| 342 // FIXME: Move this check to the end of the compositing update. | 342 // FIXME: Move this check to the end of the compositing update. |
| 343 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat
eRoot); | 343 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat
eRoot); |
| 344 #endif | 344 #endif |
| 345 } | 345 } |
| 346 | 346 |
| (...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1250 } else if (graphicsLayer == m_scrollLayer.get()) { | 1250 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1251 name = "LocalFrame Scrolling Layer"; | 1251 name = "LocalFrame Scrolling Layer"; |
| 1252 } else { | 1252 } else { |
| 1253 ASSERT_NOT_REACHED(); | 1253 ASSERT_NOT_REACHED(); |
| 1254 } | 1254 } |
| 1255 | 1255 |
| 1256 return name; | 1256 return name; |
| 1257 } | 1257 } |
| 1258 | 1258 |
| 1259 } // namespace WebCore | 1259 } // namespace WebCore |
| OLD | NEW |