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

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

Issue 176763011: Revert "Consider text alignment and direction when computing the left offset for horizontal writing… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderObject.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) 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class RenderBlock; 58 class RenderBlock;
59 class RenderFlowThread; 59 class RenderFlowThread;
60 class RenderGeometryMap; 60 class RenderGeometryMap;
61 class RenderLayer; 61 class RenderLayer;
62 class RenderLayerModelObject; 62 class RenderLayerModelObject;
63 class RenderSVGResourceContainer; 63 class RenderSVGResourceContainer;
64 class RenderTable; 64 class RenderTable;
65 class RenderTheme; 65 class RenderTheme;
66 class RenderView; 66 class RenderView;
67 class ResourceLoadPriorityOptimizer; 67 class ResourceLoadPriorityOptimizer;
68 class RootInlineBox;
69 class TransformState; 68 class TransformState;
70 69
71 struct PaintInfo; 70 struct PaintInfo;
72 71
73 enum CursorDirective { 72 enum CursorDirective {
74 SetCursorBasedOnStyle, 73 SetCursorBasedOnStyle,
75 SetCursor, 74 SetCursor,
76 DoNotSetCursor 75 DoNotSetCursor
77 }; 76 };
78 77
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 } 774 }
776 775
777 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a 776 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
778 // given new style, without accessing the cache. 777 // given new style, without accessing the cache.
779 PassRefPtr<RenderStyle> uncachedFirstLineStyle(RenderStyle*) const; 778 PassRefPtr<RenderStyle> uncachedFirstLineStyle(RenderStyle*) const;
780 779
781 // Anonymous blocks that are part of of a continuation chain will return the ir inline continuation's outline style instead. 780 // Anonymous blocks that are part of of a continuation chain will return the ir inline continuation's outline style instead.
782 // This is typically only relevant when repainting. 781 // This is typically only relevant when repainting.
783 virtual RenderStyle* outlineStyleForRepaint() const { return style(); } 782 virtual RenderStyle* outlineStyleForRepaint() const { return style(); }
784 783
785 // Return LEFT, RIGHT, CENTER or JUSTIFY considering text alignment and dire ction.
786 // If a specific RootInlineBox is specified, it will be used to calculate th e direction to be considered,
787 // otherwise the default direction for the associated style will be used.
788 ETextAlign simplifiedTextAlign(const ETextAlign&, const RootInlineBox* = 0) const;
789
790 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const; 784 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
791 785
792 void getTextDecorationColors(unsigned decorations, Color& underline, Color& overline, Color& linethrough, bool quirksMode = false, bool firstlineStyle = fal se); 786 void getTextDecorationColors(unsigned decorations, Color& underline, Color& overline, Color& linethrough, bool quirksMode = false, bool firstlineStyle = fal se);
793 787
794 // Return the RenderLayerModelObject in the container chain which is respons ible for painting this object, or 0 788 // Return the RenderLayerModelObject in the container chain which is respons ible for painting this object, or 0
795 // if painting is root-relative. This is the container that should be passed to the 'forRepaint' 789 // if painting is root-relative. This is the container that should be passed to the 'forRepaint'
796 // methods. 790 // methods.
797 RenderLayerModelObject* containerForRepaint() const; 791 RenderLayerModelObject* containerForRepaint() const;
798 // Actually do the repaint of rect r for this object which has been computed in the coordinate space 792 // Actually do the repaint of rect r for this object which has been computed in the coordinate space
799 // of repaintContainer. If repaintContainer is 0, repaint via the view. 793 // of repaintContainer. If repaintContainer is 0, repaint via the view.
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1419 void showTree(const WebCore::RenderObject*); 1413 void showTree(const WebCore::RenderObject*);
1420 void showLineTree(const WebCore::RenderObject*); 1414 void showLineTree(const WebCore::RenderObject*);
1421 void showRenderTree(const WebCore::RenderObject* object1); 1415 void showRenderTree(const WebCore::RenderObject* object1);
1422 // We don't make object2 an optional parameter so that showRenderTree 1416 // We don't make object2 an optional parameter so that showRenderTree
1423 // can be called from gdb easily. 1417 // can be called from gdb easily.
1424 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1418 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1425 1419
1426 #endif 1420 #endif
1427 1421
1428 #endif // RenderObject_h 1422 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698