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

Side by Side Diff: Source/core/rendering/RenderObject.h

Issue 25105004: Use srcset's resource pixel density to determine intrinsic size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cleantests
Patch Set: Fixed expected test results Created 7 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 ////////////////////////////////////////// 262 //////////////////////////////////////////
263 virtual bool canHaveChildren() const { return virtualChildren(); } 263 virtual bool canHaveChildren() const { return virtualChildren(); }
264 virtual bool canHaveGeneratedChildren() const; 264 virtual bool canHaveGeneratedChildren() const;
265 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; } 265 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true ; }
266 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ; 266 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ;
267 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); } 267 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild = 0) { return addChild(newChild, beforeChild); }
268 virtual void removeChild(RenderObject*); 268 virtual void removeChild(RenderObject*);
269 virtual bool createsAnonymousWrapper() const { return false; } 269 virtual bool createsAnonymousWrapper() const { return false; }
270 ////////////////////////////////////////// 270 //////////////////////////////////////////
271 271
272 virtual float intrinsicSizeFactor() const { return 1.0f; }
pdr. 2013/10/11 05:17:33 I think we can get away without adding this. Inste
Yoav Weiss 2013/10/11 07:22:32 OK
273
272 protected: 274 protected:
273 ////////////////////////////////////////// 275 //////////////////////////////////////////
274 // Helper functions. Dangerous to use! 276 // Helper functions. Dangerous to use!
275 void setPreviousSibling(RenderObject* previous) { m_previous = previous; } 277 void setPreviousSibling(RenderObject* previous) { m_previous = previous; }
276 void setNextSibling(RenderObject* next) { m_next = next; } 278 void setNextSibling(RenderObject* next) { m_next = next; }
277 void setParent(RenderObject* parent) 279 void setParent(RenderObject* parent)
278 { 280 {
279 m_parent = parent; 281 m_parent = parent;
280 282
281 // Only update if our flow thread state is different from our new parent and if we're not a RenderFlowThread. 283 // Only update if our flow thread state is different from our new parent and if we're not a RenderFlowThread.
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 void showTree(const WebCore::RenderObject*); 1393 void showTree(const WebCore::RenderObject*);
1392 void showLineTree(const WebCore::RenderObject*); 1394 void showLineTree(const WebCore::RenderObject*);
1393 void showRenderTree(const WebCore::RenderObject* object1); 1395 void showRenderTree(const WebCore::RenderObject* object1);
1394 // We don't make object2 an optional parameter so that showRenderTree 1396 // We don't make object2 an optional parameter so that showRenderTree
1395 // can be called from gdb easily. 1397 // can be called from gdb easily.
1396 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1398 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1397 1399
1398 #endif 1400 #endif
1399 1401
1400 #endif // RenderObject_h 1402 #endif // RenderObject_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698