| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y |
| 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N |
| 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 #include "platform/fonts/mac/ComplexTextController.h" | 26 #include "platform/fonts/mac/ComplexTextController.h" |
| 27 | 27 |
| 28 #include <ApplicationServices/ApplicationServices.h> | |
| 29 #include "platform/fonts/Character.h" | 28 #include "platform/fonts/Character.h" |
| 30 #include "platform/fonts/Font.h" | 29 #include "platform/fonts/Font.h" |
| 30 #include "platform/fonts/GlyphBuffer.h" |
| 31 #include "platform/geometry/FloatSize.h" | 31 #include "platform/geometry/FloatSize.h" |
| 32 #include "platform/text/TextBreakIterator.h" | 32 #include "platform/text/TextBreakIterator.h" |
| 33 #include "platform/text/TextRun.h" | 33 #include "platform/text/TextRun.h" |
| 34 #include "wtf/StdLibExtras.h" | 34 #include "wtf/StdLibExtras.h" |
| 35 #include "wtf/unicode/CharacterNames.h" | 35 #include "wtf/unicode/CharacterNames.h" |
| 36 #include <ApplicationServices/ApplicationServices.h> |
| 36 | 37 |
| 37 using namespace std; | 38 using namespace std; |
| 38 | 39 |
| 39 namespace WebCore { | 40 namespace WebCore { |
| 40 | 41 |
| 41 static inline CGFloat roundCGFloat(CGFloat f) | 42 static inline CGFloat roundCGFloat(CGFloat f) |
| 42 { | 43 { |
| 43 if (sizeof(CGFloat) == sizeof(float)) | 44 if (sizeof(CGFloat) == sizeof(float)) |
| 44 return roundf(static_cast<float>(f)); | 45 return roundf(static_cast<float>(f)); |
| 45 return static_cast<CGFloat>(round(f)); | 46 return static_cast<CGFloat>(round(f)); |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 | 661 |
| 661 lastCharacterIndex = characterIndex; | 662 lastCharacterIndex = characterIndex; |
| 662 } | 663 } |
| 663 if (!isMonotonic) | 664 if (!isMonotonic) |
| 664 complexTextRun.setIsNonMonotonic(); | 665 complexTextRun.setIsNonMonotonic(); |
| 665 } | 666 } |
| 666 m_totalWidth += widthSinceLastCommit; | 667 m_totalWidth += widthSinceLastCommit; |
| 667 } | 668 } |
| 668 | 669 |
| 669 } // namespace WebCore | 670 } // namespace WebCore |
| OLD | NEW |