| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.rend
erBox()->scrollHeight()) | 544 if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.rend
erBox()->scrollHeight()) |
| 545 ts << " scrollHeight " << l.renderBox()->scrollHeight(); | 545 ts << " scrollHeight " << l.renderBox()->scrollHeight(); |
| 546 } | 546 } |
| 547 | 547 |
| 548 if (paintPhase == LayerPaintPhaseBackground) | 548 if (paintPhase == LayerPaintPhaseBackground) |
| 549 ts << " layerType: background only"; | 549 ts << " layerType: background only"; |
| 550 else if (paintPhase == LayerPaintPhaseForeground) | 550 else if (paintPhase == LayerPaintPhaseForeground) |
| 551 ts << " layerType: foreground only"; | 551 ts << " layerType: foreground only"; |
| 552 | 552 |
| 553 if (behavior & RenderAsTextShowCompositedLayers) { | 553 if (behavior & RenderAsTextShowCompositedLayers) { |
| 554 if (l.compositedLayerMapping()) { | 554 if (l.hasCompositedLayerMapping()) { |
| 555 ts << " (composited, bounds=" | 555 ts << " (composited, bounds=" |
| 556 << l.compositedLayerMapping()->compositedBounds() | 556 << l.compositedLayerMapping()->compositedBounds() |
| 557 << ", drawsContent=" | 557 << ", drawsContent=" |
| 558 << l.compositedLayerMapping()->mainGraphicsLayer()->drawsContent
() | 558 << l.compositedLayerMapping()->mainGraphicsLayer()->drawsContent
() |
| 559 << ", paints into ancestor=" | 559 << ", paints into ancestor=" |
| 560 << l.compositedLayerMapping()->paintsIntoCompositedAncestor() | 560 << l.compositedLayerMapping()->paintsIntoCompositedAncestor() |
| 561 << ")"; | 561 << ")"; |
| 562 } | 562 } |
| 563 } | 563 } |
| 564 | 564 |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 element->document().updateLayout(); | 828 element->document().updateLayout(); |
| 829 | 829 |
| 830 RenderObject* renderer = element->renderer(); | 830 RenderObject* renderer = element->renderer(); |
| 831 if (!renderer || !renderer->isListItem()) | 831 if (!renderer || !renderer->isListItem()) |
| 832 return String(); | 832 return String(); |
| 833 | 833 |
| 834 return toRenderListItem(renderer)->markerText(); | 834 return toRenderListItem(renderer)->markerText(); |
| 835 } | 835 } |
| 836 | 836 |
| 837 } // namespace WebCore | 837 } // namespace WebCore |
| OLD | NEW |