-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
text-combine-upright: all
& text-transform
don't work together
#8703
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<!DOCTYPE html> | ||
<body style="writing-mode: vertical-rl"> | ||
Test text-combine-upright: all + text-transform<br><br> | ||
text-transform: capitalize<br> | ||
The following "a" should be upright and captalize: <span style="text-combine-upright: all;">A</span><br><br> | ||
text-transform: lowercase<br> | ||
The following "A" should be upright and lowercase: <span style="text-combine-upright: all;">a</span><br><br> | ||
text-transform: uppercase<br> | ||
The following "a" should be upright and uppercase: <span style="text-combine-upright: all;">A</span><br><br> | ||
</body> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<!DOCTYPE html> | ||
<body style="writing-mode: vertical-rl"> | ||
Test text-combine-upright: all + text-transform<br><br> | ||
text-transform: capitalize<br> | ||
The following "a" should be upright and captalize: <span style="text-combine-upright: all; text-transform: capitalize;">a</span><br><br> | ||
text-transform: lowercase<br> | ||
The following "A" should be upright and lowercase: <span style="text-combine-upright: all; text-transform: lowercase;">A</span><br><br> | ||
text-transform: uppercase<br> | ||
The following "a" should be upright and uppercase: <span style="text-combine-upright: all; text-transform: uppercase;">a</span><br><br> | ||
</body> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
/* | ||
* Copyright (C) 2011 Apple Inc. All rights reserved. | ||
* Copyright (C) 2011-2023 Apple Inc. All rights reserved. | ||
* Copyright (C) 2014 Google Inc. All rights reserved. | ||
* | ||
* This library is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Library General Public | ||
|
@@ -53,6 +54,7 @@ class RenderCombineText final : public RenderText { | |
float m_combinedTextWidth { 0 }; | ||
float m_combinedTextAscent { 0 }; | ||
float m_combinedTextDescent { 0 }; | ||
String m_renderedText; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This naming is confusing. It does not represent the rendered combined text, this is pre-combined after-transformed text. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not even sure if I agree with this approach, but since RenderCombine is going to go through a proper refactoring soonish, I guess this will do for now. |
||
bool m_isCombined : 1; | ||
bool m_needsFontUpdate : 1; | ||
}; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the original intended was to copy the string.
@darinadler @cdumez The original Blink patch did
RenderText::setRenderedText(m_renderedText.impl())
, although I'm not sure if that's the common pattern.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks right to me. No reason to take the StringImpl here, they should be equivalent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like maybe the Blink merge simply isn't working, the initial version without any of my requested changes had the test failing on Windows.