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

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

Issue 9762003: Merge 110323 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 9 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/rendering/RenderObject.h ('k') | Source/WebCore/rendering/RenderReplaced.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 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) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2748 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 2759
2760 ASSERT(!node()); 2760 ASSERT(!node());
2761 return createVisiblePosition(0, DOWNSTREAM); 2761 return createVisiblePosition(0, DOWNSTREAM);
2762 } 2762 }
2763 2763
2764 CursorDirective RenderObject::getCursor(const LayoutPoint&, Cursor&) const 2764 CursorDirective RenderObject::getCursor(const LayoutPoint&, Cursor&) const
2765 { 2765 {
2766 return SetCursorBasedOnStyle; 2766 return SetCursorBasedOnStyle;
2767 } 2767 }
2768 2768
2769 bool RenderObject::canUpdateSelectionOnRootLineBoxes()
2770 {
2771 RenderBlock* containingBlock = this->containingBlock();
2772 return containingBlock ? !containingBlock->needsLayout() : true;
2773 }
2774
2769 #if ENABLE(SVG) 2775 #if ENABLE(SVG)
2770 2776
2771 RenderSVGResourceContainer* RenderObject::toRenderSVGResourceContainer() 2777 RenderSVGResourceContainer* RenderObject::toRenderSVGResourceContainer()
2772 { 2778 {
2773 ASSERT_NOT_REACHED(); 2779 ASSERT_NOT_REACHED();
2774 return 0; 2780 return 0;
2775 } 2781 }
2776 2782
2777 void RenderObject::setNeedsBoundariesUpdate() 2783 void RenderObject::setNeedsBoundariesUpdate()
2778 { 2784 {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
2845 { 2851 {
2846 if (object1) { 2852 if (object1) {
2847 const WebCore::RenderObject* root = object1; 2853 const WebCore::RenderObject* root = object1;
2848 while (root->parent()) 2854 while (root->parent())
2849 root = root->parent(); 2855 root = root->parent();
2850 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2856 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2851 } 2857 }
2852 } 2858 }
2853 2859
2854 #endif 2860 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.h ('k') | Source/WebCore/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698