| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "platform/text/BidiTextRun.h" | 32 #include "platform/text/BidiTextRun.h" |
| 33 | 33 |
| 34 #include "platform/text/BidiResolver.h" | 34 #include "platform/text/BidiResolver.h" |
| 35 #include "platform/text/TextRunIterator.h" | 35 #include "platform/text/TextRunIterator.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace blink { |
| 38 | 38 |
| 39 TextDirection directionForRun(TextRun& run, bool& hasStrongDirectionality) | 39 TextDirection directionForRun(TextRun& run, bool& hasStrongDirectionality) |
| 40 { | 40 { |
| 41 BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver; | 41 BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver; |
| 42 bidiResolver.setStatus(BidiStatus(run.direction(), run.directionalOverride()
)); | 42 bidiResolver.setStatus(BidiStatus(run.direction(), run.directionalOverride()
)); |
| 43 bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&run, 0)); | 43 bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&run, 0)); |
| 44 return bidiResolver.determineParagraphDirectionality(&hasStrongDirectionalit
y); | 44 return bidiResolver.determineParagraphDirectionality(&hasStrongDirectionalit
y); |
| 45 } | 45 } |
| 46 | 46 |
| 47 TextDirection determineDirectionality(const String& value, bool& hasStrongDirect
ionality) | 47 TextDirection determineDirectionality(const String& value, bool& hasStrongDirect
ionality) |
| 48 { | 48 { |
| 49 TextRun run(value); | 49 TextRun run(value); |
| 50 return directionForRun(run, hasStrongDirectionality); | 50 return directionForRun(run, hasStrongDirectionality); |
| 51 } | 51 } |
| 52 | 52 |
| 53 TextRun textRunWithDirectionality(const String& value, bool& hasStrongDirectiona
lity) | 53 TextRun textRunWithDirectionality(const String& value, bool& hasStrongDirectiona
lity) |
| 54 { | 54 { |
| 55 TextRun run(value); | 55 TextRun run(value); |
| 56 TextDirection direction = directionForRun(run, hasStrongDirectionality); | 56 TextDirection direction = directionForRun(run, hasStrongDirectionality); |
| 57 if (hasStrongDirectionality) | 57 if (hasStrongDirectionality) |
| 58 run.setDirection(direction); | 58 run.setDirection(direction); |
| 59 return run; | 59 return run; |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace WebCore | 62 } // namespace blink |
| 63 | 63 |
| OLD | NEW |