| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2006, 2007 Apple Computer, Inc. |    2  * Copyright (C) 2006, 2007 Apple Computer, Inc. | 
|    3  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. |    3  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. | 
|    4  * |    4  * | 
|    5  * Redistribution and use in source and binary forms, with or without |    5  * Redistribution and use in source and binary forms, with or without | 
|    6  * modification, are permitted provided that the following conditions are |    6  * modification, are permitted provided that the following conditions are | 
|    7  * met: |    7  * met: | 
|    8  * |    8  * | 
|    9  *     * Redistributions of source code must retain the above copyright |    9  *     * Redistributions of source code must retain the above copyright | 
|   10  * notice, this list of conditions and the following disclaimer. |   10  * notice, this list of conditions and the following disclaimer. | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
|   26  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |   26  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
|   27  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   27  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   30  */ |   30  */ | 
|   31  |   31  | 
|   32 #include "config.h" |   32 #include "config.h" | 
|   33 #include "core/platform/graphics/FontCache.h" |   33 #include "core/platform/graphics/FontCache.h" | 
|   34  |   34  | 
|   35 #include <unicode/uniset.h> |   35 #include <unicode/uniset.h> | 
|   36 #include "core/platform/LayoutTestSupport.h" |  | 
|   37 #include "core/platform/graphics/Font.h" |   36 #include "core/platform/graphics/Font.h" | 
|   38 #include "core/platform/graphics/SimpleFontData.h" |   37 #include "core/platform/graphics/SimpleFontData.h" | 
|   39 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" |   38 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" | 
|   40 #include "core/platform/graphics/chromium/FontUtilsChromiumWin.h" |   39 #include "core/platform/graphics/chromium/FontUtilsChromiumWin.h" | 
|   41 #include "core/platform/win/HWndDC.h" |   40 #include "core/platform/win/HWndDC.h" | 
 |   41 #include "platform/LayoutTestSupport.h" | 
|   42 #include "wtf/HashMap.h" |   42 #include "wtf/HashMap.h" | 
|   43 #include "wtf/HashSet.h" |   43 #include "wtf/HashSet.h" | 
|   44 #include "wtf/text/StringHash.h" |   44 #include "wtf/text/StringHash.h" | 
|   45  |   45  | 
|   46 #include <windows.h> |   46 #include <windows.h> | 
|   47 #include <mlang.h> |   47 #include <mlang.h> | 
|   48 #include <objidl.h> |   48 #include <objidl.h> | 
|   49  |   49  | 
|   50 using std::min; |   50 using std::min; | 
|   51  |   51  | 
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  638             return 0; |  638             return 0; | 
|  639         } |  639         } | 
|  640     } |  640     } | 
|  641  |  641  | 
|  642     return new FontPlatformData(hfont, |  642     return new FontPlatformData(hfont, | 
|  643                                 fontDescription.computedPixelSize(), |  643                                 fontDescription.computedPixelSize(), | 
|  644                                 fontDescription.orientation()); |  644                                 fontDescription.orientation()); | 
|  645 } |  645 } | 
|  646  |  646  | 
|  647 } |  647 } | 
| OLD | NEW |