walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[coretext] Remove dead code 

Fixes https://github.com/harfbuzz/harfbuzz/issues/3484
This commit is contained in:
Behdad Esfahbod 2022-03-21 10:37:42 -06:00
parent 7bdc20ec81
commit 1ffe637a0e
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-coretext.cc
View File

@ -897,7 +897,7 @@ resize_and_retry:
DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs); DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs);
buffer->len = 0; buffer->len = 0;
uint32_t status_and = ~0, status_or = 0; uint32_t status_or = 0;
CGFloat advances_so_far = 0; CGFloat advances_so_far = 0;
/* For right-to-left runs, CoreText returns the glyphs positioned such that /* For right-to-left runs, CoreText returns the glyphs positioned such that
* any trailing whitespace is to the left of (0,0). Adjust coordinate system * any trailing whitespace is to the left of (0,0). Adjust coordinate system
@ -918,7 +918,6 @@ resize_and_retry:
CTRunRef run = static_cast<CTRunRef>(CFArrayGetValueAtIndex (glyph_runs, i)); CTRunRef run = static_cast<CTRunRef>(CFArrayGetValueAtIndex (glyph_runs, i));
CTRunStatus run_status = CTRunGetStatus (run); CTRunStatus run_status = CTRunGetStatus (run);
status_or |= run_status; status_or |= run_status;
status_and &= run_status;
DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status);
CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr); CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr);
if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction))
@ -1140,21 +1139,6 @@ resize_and_retry:
buffer->len += num_glyphs; buffer->len += num_glyphs;
} }
/* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel,
* or if it does, it doesn't respect it. So we get runs with wrong
* directions. As such, disable the assert... It wouldn't crash, but
* cursoring will be off...
*
* https://crbug.com/419769
*/
if (false)
{
/* Make sure all runs had the expected direction. */
HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
assert (bool (status_and & kCTRunStatusRightToLeft) == backward);
assert (bool (status_or & kCTRunStatusRightToLeft) == backward);
}
buffer->clear_positions (); buffer->clear_positions ();
unsigned int count = buffer->len; unsigned int count = buffer->len;