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

Side by Side Diff: Source/WebKit/chromium/src/NonCompositedContentHost.cpp

Issue 10782018: Merge 122529 - [chromium] Root invalidations for RTL pages need to be in the right space (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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/compositing/rtl/rtl-overflow-invalidation-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) 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 WebCore::LayerChromium* NonCompositedContentHost::scrollLayer() 145 WebCore::LayerChromium* NonCompositedContentHost::scrollLayer()
146 { 146 {
147 if (!m_graphicsLayer->parent()) 147 if (!m_graphicsLayer->parent())
148 return 0; 148 return 0;
149 return m_graphicsLayer->parent()->platformLayer(); 149 return m_graphicsLayer->parent()->platformLayer();
150 } 150 }
151 151
152 void NonCompositedContentHost::invalidateRect(const WebCore::IntRect& rect) 152 void NonCompositedContentHost::invalidateRect(const WebCore::IntRect& rect)
153 { 153 {
154 m_graphicsLayer->setNeedsDisplayInRect(WebCore::FloatRect(rect)); 154 WebCore::IntRect layerRect = rect;
155 layerRect.move(-m_layerAdjust);
156 m_graphicsLayer->setNeedsDisplayInRect(WebCore::FloatRect(layerRect));
155 } 157 }
156 158
157 void NonCompositedContentHost::notifyAnimationStarted(const WebCore::GraphicsLay er*, double /* time */) 159 void NonCompositedContentHost::notifyAnimationStarted(const WebCore::GraphicsLay er*, double /* time */)
158 { 160 {
159 // Intentionally left empty since we don't support animations on the non-com posited content. 161 // Intentionally left empty since we don't support animations on the non-com posited content.
160 } 162 }
161 163
162 void NonCompositedContentHost::notifySyncRequired(const WebCore::GraphicsLayer*) 164 void NonCompositedContentHost::notifySyncRequired(const WebCore::GraphicsLayer*)
163 { 165 {
164 WebCore::CCLayerTreeHost* layerTreeHost = m_graphicsLayer->platformLayer()-> layerTreeHost(); 166 WebCore::CCLayerTreeHost* layerTreeHost = m_graphicsLayer->platformLayer()-> layerTreeHost();
(...skipping 25 matching lines...) Expand all
190 { 192 {
191 return m_showDebugBorders; 193 return m_showDebugBorders;
192 } 194 }
193 195
194 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const 196 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const
195 { 197 {
196 return false; 198 return false;
197 } 199 }
198 200
199 } // namespace WebKit 201 } // namespace WebKit
OLDNEW
« no previous file with comments | « LayoutTests/compositing/rtl/rtl-overflow-invalidation-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698