| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. | 2  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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 "core/platform/graphics/chromium/UniscribeHelper.h" | 32 #include "core/platform/graphics/chromium/UniscribeHelper.h" | 
| 33 | 33 | 
| 34 #include <windows.h> | 34 #include <windows.h> | 
| 35 #include "core/platform/graphics/Font.h" | 35 #include "core/platform/graphics/Font.h" | 
| 36 #include "core/platform/graphics/GraphicsContext.h" | 36 #include "core/platform/graphics/GraphicsContext.h" | 
| 37 #include "core/platform/graphics/chromium/FontFallbackWin.h" |  | 
| 38 #include "core/platform/graphics/skia/SkiaFontWin.h" | 37 #include "core/platform/graphics/skia/SkiaFontWin.h" | 
|  | 38 #include "platform/fonts/FontFallbackWin.h" | 
| 39 #include "platform/win/HWndDC.h" | 39 #include "platform/win/HWndDC.h" | 
| 40 #include "third_party/skia/include/core/SkPoint.h" | 40 #include "third_party/skia/include/core/SkPoint.h" | 
| 41 #include "wtf/Assertions.h" | 41 #include "wtf/Assertions.h" | 
| 42 | 42 | 
| 43 namespace WebCore { | 43 namespace WebCore { | 
| 44 | 44 | 
| 45 // The function types for ScriptItemizeOpenType() and ScriptShapeOpenType(). | 45 // The function types for ScriptItemizeOpenType() and ScriptShapeOpenType(). | 
| 46 // We want to use these functions for OpenType feature support, but we can't | 46 // We want to use these functions for OpenType feature support, but we can't | 
| 47 // call them directly because usp10.dll does not always have them. | 47 // call them directly because usp10.dll does not always have them. | 
| 48 // Instead, we use GetProcAddress() to check whether we can actually use these | 48 // Instead, we use GetProcAddress() to check whether we can actually use these | 
| (...skipping 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1200     m_featureRecords.resize(featureSettings->size()); | 1200     m_featureRecords.resize(featureSettings->size()); | 
| 1201     for (unsigned i = 0; i < featureSettings->size(); ++i) { | 1201     for (unsigned i = 0; i < featureSettings->size(); ++i) { | 
| 1202         m_featureRecords[i].lParameter = featureSettings->at(i).value(); | 1202         m_featureRecords[i].lParameter = featureSettings->at(i).value(); | 
| 1203         m_featureRecords[i].tagFeature = convertFeatureTag(featureSettings->at(i
      ).tag()); | 1203         m_featureRecords[i].tagFeature = convertFeatureTag(featureSettings->at(i
      ).tag()); | 
| 1204     } | 1204     } | 
| 1205     m_rangeProperties.potfRecords = &m_featureRecords[0]; | 1205     m_rangeProperties.potfRecords = &m_featureRecords[0]; | 
| 1206     m_rangeProperties.cotfRecords = m_featureRecords.size(); | 1206     m_rangeProperties.cotfRecords = m_featureRecords.size(); | 
| 1207 } | 1207 } | 
| 1208 | 1208 | 
| 1209 }  // namespace WebCore | 1209 }  // namespace WebCore | 
| OLD | NEW | 
|---|