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

Side by Side Diff: Source/core/layout/TextRunConstructor.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/TextAutosizer.cpp ('k') | Source/core/layout/TextRunConstructor.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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 27 matching lines...) Expand all
38 38
39 #include "platform/text/TextDirection.h" 39 #include "platform/text/TextDirection.h"
40 #include "platform/text/TextRun.h" 40 #include "platform/text/TextRun.h"
41 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
42 #include "wtf/unicode/Unicode.h" 42 #include "wtf/unicode/Unicode.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 class Font; 46 class Font;
47 class LayoutObject; 47 class LayoutObject;
48 class LayoutStyle; 48 class ComputedStyle;
49 class LayoutText; 49 class LayoutText;
50 50
51 enum TextRunFlag { 51 enum TextRunFlag {
52 DefaultTextRunFlags = 0, 52 DefaultTextRunFlags = 0,
53 RespectDirection = 1 << 0, 53 RespectDirection = 1 << 0,
54 RespectDirectionOverride = 1 << 1 54 RespectDirectionOverride = 1 << 1
55 }; 55 };
56 56
57 typedef unsigned TextRunFlags; 57 typedef unsigned TextRunFlags;
58 58
59 // Direction resolved from string value. 59 // Direction resolved from string value.
60 TextRun constructTextRun(LayoutObject* context, const Font&, const String&, cons t LayoutStyle&, TextRunFlags = DefaultTextRunFlags); 60 TextRun constructTextRun(LayoutObject* context, const Font&, const String&, cons t ComputedStyle&, TextRunFlags = DefaultTextRunFlags);
61 TextRun constructTextRun(LayoutObject* context, const Font&, const LayoutText*, unsigned offset, unsigned length, const LayoutStyle&); 61 TextRun constructTextRun(LayoutObject* context, const Font&, const LayoutText*, unsigned offset, unsigned length, const ComputedStyle&);
62 62
63 // Explicit direction. 63 // Explicit direction.
64 TextRun constructTextRun(LayoutObject*, const Font&, const String&, const Layout Style&, TextDirection, TextRunFlags = DefaultTextRunFlags); 64 TextRun constructTextRun(LayoutObject*, const Font&, const String&, const Comput edStyle&, TextDirection, TextRunFlags = DefaultTextRunFlags);
65 TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, const La youtStyle&, TextDirection); 65 TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, const Co mputedStyle&, TextDirection);
66 TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, unsigned offset, unsigned length, const LayoutStyle&, TextDirection); 66 TextRun constructTextRun(LayoutObject*, const Font&, const LayoutText*, unsigned offset, unsigned length, const ComputedStyle&, TextDirection);
67 TextRun constructTextRun(LayoutObject*, const Font&, const LChar*, int length, c onst LayoutStyle&, TextDirection); 67 TextRun constructTextRun(LayoutObject*, const Font&, const LChar*, int length, c onst ComputedStyle&, TextDirection);
68 TextRun constructTextRun(LayoutObject*, const Font&, const UChar*, int length, c onst LayoutStyle&, TextDirection); 68 TextRun constructTextRun(LayoutObject*, const Font&, const UChar*, int length, c onst ComputedStyle&, TextDirection);
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif 72 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/TextAutosizer.cpp ('k') | Source/core/layout/TextRunConstructor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698