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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderLayer.h

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Apple Computer, Inc. 2 * Copyright (C) 2003 Apple Computer, Inc.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 void updateScrollInfoAfterLayout(); 295 void updateScrollInfoAfterLayout();
296 296
297 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1.0f); 297 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1.0f);
298 void autoscroll(); 298 void autoscroll();
299 299
300 void resize(const PlatformMouseEvent&, const IntSize&); 300 void resize(const PlatformMouseEvent&, const IntSize&);
301 bool inResizeMode() const { return m_inResizeMode; } 301 bool inResizeMode() const { return m_inResizeMode; }
302 void setInResizeMode(bool b) { m_inResizeMode = b; } 302 void setInResizeMode(bool b) { m_inResizeMode = b; }
303 303
304 // Can't just check !parent() because we might be unrooted.
305 bool isRootLayer() const { return renderer()->node()->isDocumentNode(); }
306
304 #if USE(ACCELERATED_COMPOSITING) 307 #if USE(ACCELERATED_COMPOSITING)
305 RenderLayerCompositor* compositor() const; 308 RenderLayerCompositor* compositor() const;
306 #endif 309 #endif
307 310
308 void updateLayerPosition(); 311 void updateLayerPosition();
309 void updateLayerPositions(bool doFullRepaint = false, bool checkForRepaint = true); 312 void updateLayerPositions(bool doFullRepaint = false, bool checkForRepaint = true);
310 313
311 void updateTransform(); 314 void updateTransform();
312 315
313 void relativePositionOffset(int& relX, int& relY) const { relX += m_relX; re lY += m_relY; } 316 void relativePositionOffset(int& relX, int& relY) const { relX += m_relX; re lY += m_relY; }
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 RenderScrollbarPart* m_resizer; 580 RenderScrollbarPart* m_resizer;
578 581
579 #if USE(ACCELERATED_COMPOSITING) 582 #if USE(ACCELERATED_COMPOSITING)
580 OwnPtr<RenderLayerBacking> m_backing; 583 OwnPtr<RenderLayerBacking> m_backing;
581 #endif 584 #endif
582 }; 585 };
583 586
584 } // namespace WebCore 587 } // namespace WebCore
585 588
586 #endif // RenderLayer_h 589 #endif // RenderLayer_h
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderInline.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698