| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 | 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 } | 413 } |
| 414 } | 414 } |
| 415 | 415 |
| 416 void CCLayerTreeHost::setContentsMemoryAllocationLimitBytes(size_t bytes) | 416 void CCLayerTreeHost::setContentsMemoryAllocationLimitBytes(size_t bytes) |
| 417 { | 417 { |
| 418 ASSERT(CCProxy::isMainThread()); | 418 ASSERT(CCProxy::isMainThread()); |
| 419 if (!m_layerRendererInitialized) | 419 if (!m_layerRendererInitialized) |
| 420 return; | 420 return; |
| 421 | 421 |
| 422 m_contentsTextureManager->setMemoryAllocationLimitBytes(bytes); | 422 m_contentsTextureManager->setMemoryAllocationLimitBytes(bytes); |
| 423 setNeedsCommit(); |
| 423 } | 424 } |
| 424 | 425 |
| 425 | 426 |
| 426 void CCLayerTreeHost::startPageScaleAnimation(const IntSize& targetPosition, boo
l useAnchor, float scale, double durationSec) | 427 void CCLayerTreeHost::startPageScaleAnimation(const IntSize& targetPosition, boo
l useAnchor, float scale, double durationSec) |
| 427 { | 428 { |
| 428 m_proxy->startPageScaleAnimation(targetPosition, useAnchor, scale, durationS
ec); | 429 m_proxy->startPageScaleAnimation(targetPosition, useAnchor, scale, durationS
ec); |
| 429 } | 430 } |
| 430 | 431 |
| 431 void CCLayerTreeHost::loseContext(int numTimes) | 432 void CCLayerTreeHost::loseContext(int numTimes) |
| 432 { | 433 { |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 else | 692 else |
| 692 layer->notifyAnimationFinished(wallClockTime); | 693 layer->notifyAnimationFinished(wallClockTime); |
| 693 } | 694 } |
| 694 } | 695 } |
| 695 | 696 |
| 696 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn
dex) | 697 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn
dex) |
| 697 setAnimationEventsRecursive(events, layer->children()[childIndex].get(),
wallClockTime); | 698 setAnimationEventsRecursive(events, layer->children()[childIndex].get(),
wallClockTime); |
| 698 } | 699 } |
| 699 | 700 |
| 700 } // namespace WebCore | 701 } // namespace WebCore |
| OLD | NEW |