| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 } | 266 } |
| 267 | 267 |
| 268 if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showRepaintC
ounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode
) | 268 if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showRepaintC
ounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode
) |
| 269 setCompositingLayersNeedRebuild(); | 269 setCompositingLayersNeedRebuild(); |
| 270 | 270 |
| 271 m_hasAcceleratedCompositing = hasAcceleratedCompositing; | 271 m_hasAcceleratedCompositing = hasAcceleratedCompositing; |
| 272 m_showRepaintCounter = showRepaintCounter; | 272 m_showRepaintCounter = showRepaintCounter; |
| 273 m_forceCompositingMode = forceCompositingMode; | 273 m_forceCompositingMode = forceCompositingMode; |
| 274 } | 274 } |
| 275 | 275 |
| 276 bool RenderLayerCompositor::isLayerSquashingEnabled() const |
| 277 { |
| 278 if (Settings* settings = m_renderView->document().settings()) |
| 279 return settings->isLayerSquashingEnabled(); |
| 280 |
| 281 return false; |
| 282 } |
| 283 |
| 276 bool RenderLayerCompositor::canRender3DTransforms() const | 284 bool RenderLayerCompositor::canRender3DTransforms() const |
| 277 { | 285 { |
| 278 return hasAcceleratedCompositing() && (m_compositingTriggers & ChromeClient:
:ThreeDTransformTrigger); | 286 return hasAcceleratedCompositing() && (m_compositingTriggers & ChromeClient:
:ThreeDTransformTrigger); |
| 279 } | 287 } |
| 280 | 288 |
| 281 void RenderLayerCompositor::setCompositingLayersNeedRebuild(bool needRebuild) | 289 void RenderLayerCompositor::setCompositingLayersNeedRebuild(bool needRebuild) |
| 282 { | 290 { |
| 283 if (inCompositingMode()) | 291 if (inCompositingMode()) |
| 284 m_compositingLayersNeedRebuild = needRebuild; | 292 m_compositingLayersNeedRebuild = needRebuild; |
| 285 } | 293 } |
| (...skipping 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2454 } else if (graphicsLayer == m_scrollLayer.get()) { | 2462 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2455 name = "Frame Scrolling Layer"; | 2463 name = "Frame Scrolling Layer"; |
| 2456 } else { | 2464 } else { |
| 2457 ASSERT_NOT_REACHED(); | 2465 ASSERT_NOT_REACHED(); |
| 2458 } | 2466 } |
| 2459 | 2467 |
| 2460 return name; | 2468 return name; |
| 2461 } | 2469 } |
| 2462 | 2470 |
| 2463 } // namespace WebCore | 2471 } // namespace WebCore |
| OLD | NEW |