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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/LayerChromium.h

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/chromium/LayerChromium.cpp » ('j') | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 void setAnchorPoint(const FloatPoint&); 93 void setAnchorPoint(const FloatPoint&);
94 FloatPoint anchorPoint() const { return m_anchorPoint; } 94 FloatPoint anchorPoint() const { return m_anchorPoint; }
95 95
96 void setAnchorPointZ(float); 96 void setAnchorPointZ(float);
97 float anchorPointZ() const { return m_anchorPointZ; } 97 float anchorPointZ() const { return m_anchorPointZ; }
98 98
99 void setBackgroundColor(const Color&); 99 void setBackgroundColor(const Color&);
100 Color backgroundColor() const { return m_backgroundColor; } 100 Color backgroundColor() const { return m_backgroundColor; }
101 101
102 void setBackgroundCoversViewport(bool);
103 bool backgroundCoversViewport() const { return m_backgroundCoversViewport; }
104
105 void setBounds(const IntSize&); 102 void setBounds(const IntSize&);
106 virtual IntSize contentBounds() const { return bounds(); } 103 virtual IntSize contentBounds() const { return bounds(); }
107 104
108 void setMasksToBounds(bool); 105 void setMasksToBounds(bool);
109 bool masksToBounds() const { return m_masksToBounds; } 106 bool masksToBounds() const { return m_masksToBounds; }
110 107
111 void setMaskLayer(LayerChromium*); 108 void setMaskLayer(LayerChromium*);
112 LayerChromium* maskLayer() const { return m_maskLayer.get(); } 109 LayerChromium* maskLayer() const { return m_maskLayer.get(); }
113 110
114 virtual void setNeedsDisplayRect(const FloatRect& dirtyRect); 111 virtual void setNeedsDisplayRect(const FloatRect& dirtyRect);
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 236
240 CCLayerAnimationController* layerAnimationController() { return m_layerAnima tionController.get(); } 237 CCLayerAnimationController* layerAnimationController() { return m_layerAnima tionController.get(); }
241 void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>); 238 void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>);
242 239
243 void setLayerAnimationDelegate(CCLayerAnimationDelegate* layerAnimationDeleg ate) { m_layerAnimationDelegate = layerAnimationDelegate; } 240 void setLayerAnimationDelegate(CCLayerAnimationDelegate* layerAnimationDeleg ate) { m_layerAnimationDelegate = layerAnimationDelegate; }
244 241
245 bool hasActiveAnimation() const; 242 bool hasActiveAnimation() const;
246 243
247 void notifyAnimationStarted(const CCAnimationStartedEvent&, double wallClock Time); 244 void notifyAnimationStarted(const CCAnimationStartedEvent&, double wallClock Time);
248 245
249 virtual Region visibleContentOpaqueRegion() const { return Region(); }; 246 virtual Region visibleContentOpaqueRegion() const;
250 247
251 virtual ScrollbarLayerChromium* toScrollbarLayerChromium() { return 0; } 248 virtual ScrollbarLayerChromium* toScrollbarLayerChromium() { return 0; }
252 249
253 protected: 250 protected:
254 friend class CCLayerImpl; 251 friend class CCLayerImpl;
255 friend class LayerTilerChromium; 252 friend class LayerTilerChromium;
256 friend class TreeSynchronizer; 253 friend class TreeSynchronizer;
257 254
258 LayerChromium(); 255 LayerChromium();
259 256
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 IntRect m_visibleLayerRect; 295 IntRect m_visibleLayerRect;
299 IntPoint m_scrollPosition; 296 IntPoint m_scrollPosition;
300 bool m_scrollable; 297 bool m_scrollable;
301 bool m_shouldScrollOnMainThread; 298 bool m_shouldScrollOnMainThread;
302 bool m_haveWheelEventHandlers; 299 bool m_haveWheelEventHandlers;
303 Region m_nonFastScrollableRegion; 300 Region m_nonFastScrollableRegion;
304 bool m_nonFastScrollableRegionChanged; 301 bool m_nonFastScrollableRegionChanged;
305 FloatPoint m_position; 302 FloatPoint m_position;
306 FloatPoint m_anchorPoint; 303 FloatPoint m_anchorPoint;
307 Color m_backgroundColor; 304 Color m_backgroundColor;
308 bool m_backgroundCoversViewport;
309 Color m_debugBorderColor; 305 Color m_debugBorderColor;
310 float m_debugBorderWidth; 306 float m_debugBorderWidth;
311 String m_debugName; 307 String m_debugName;
312 float m_opacity; 308 float m_opacity;
313 FilterOperations m_filters; 309 FilterOperations m_filters;
314 float m_anchorPointZ; 310 float m_anchorPointZ;
315 bool m_isDrawable; 311 bool m_isDrawable;
316 bool m_masksToBounds; 312 bool m_masksToBounds;
317 bool m_opaque; 313 bool m_opaque;
318 bool m_doubleSided; 314 bool m_doubleSided;
(...skipping 25 matching lines...) Expand all
344 340
345 CCLayerAnimationDelegate* m_layerAnimationDelegate; 341 CCLayerAnimationDelegate* m_layerAnimationDelegate;
346 }; 342 };
347 343
348 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*); 344 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*);
349 345
350 } 346 }
351 #endif // USE(ACCELERATED_COMPOSITING) 347 #endif // USE(ACCELERATED_COMPOSITING)
352 348
353 #endif 349 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/chromium/LayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698