Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: Source/WebCore/rendering/RenderLayerCompositor.cpp

Issue 6597014: Merge 79699 - 2011-02-25 Vangelis Kokkevis <vangelis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/platform/chromium/compositing/layout-width-change-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 1093
1094 detachRootPlatformLayer(); 1094 detachRootPlatformLayer();
1095 } 1095 }
1096 1096
1097 void RenderLayerCompositor::updateRootLayerPosition() 1097 void RenderLayerCompositor::updateRootLayerPosition()
1098 { 1098 {
1099 if (m_rootPlatformLayer) { 1099 if (m_rootPlatformLayer) {
1100 m_rootPlatformLayer->setSize(FloatSize(m_renderView->docWidth(), m_rende rView->docHeight())); 1100 m_rootPlatformLayer->setSize(FloatSize(m_renderView->docWidth(), m_rende rView->docHeight()));
1101 m_rootPlatformLayer->setPosition(FloatPoint(m_renderView->docLeft(), m_r enderView->docTop())); 1101 m_rootPlatformLayer->setPosition(FloatPoint(m_renderView->docLeft(), m_r enderView->docTop()));
1102 } 1102 }
1103 if (m_clipLayer) {
1104 FrameView* frameView = m_renderView->frameView();
1105 m_clipLayer->setSize(FloatSize(frameView->layoutWidth(), frameView->layo utHeight()));
1106 }
1103 } 1107 }
1104 1108
1105 void RenderLayerCompositor::didStartAcceleratedAnimation(CSSPropertyID property) 1109 void RenderLayerCompositor::didStartAcceleratedAnimation(CSSPropertyID property)
1106 { 1110 {
1107 // If an accelerated animation or transition runs, we have to turn off overl ap checking because 1111 // If an accelerated animation or transition runs, we have to turn off overl ap checking because
1108 // we don't do layout for every frame, but we have to ensure that the layeri ng is 1112 // we don't do layout for every frame, but we have to ensure that the layeri ng is
1109 // correct between the animating object and other objects on the page. 1113 // correct between the animating object and other objects on the page.
1110 if (property == CSSPropertyWebkitTransform) 1114 if (property == CSSPropertyWebkitTransform)
1111 setCompositingConsultsOverlap(false); 1115 setCompositingConsultsOverlap(false);
1112 } 1116 }
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 size_t listSize = normalFlowList->size(); 1639 size_t listSize = normalFlowList->size();
1636 for (size_t i = 0; i < listSize; ++i) 1640 for (size_t i = 0; i < listSize; ++i)
1637 updateContentsScale(scale, normalFlowList->at(i)); 1641 updateContentsScale(scale, normalFlowList->at(i));
1638 } 1642 }
1639 } 1643 }
1640 1644
1641 } // namespace WebCore 1645 } // namespace WebCore
1642 1646
1643 #endif // USE(ACCELERATED_COMPOSITING) 1647 #endif // USE(ACCELERATED_COMPOSITING)
1644 1648
OLDNEW
« no previous file with comments | « LayoutTests/platform/chromium/compositing/layout-width-change-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698