Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: Source/core/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp

Issue 25494003: Move geometry classes from core/platform/graphics to platform/geometry (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All Rights Reserved.
3 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (c) 2008, 2009, 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 18 matching lines...) Expand all
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/SimpleFontData.h" 33 #include "core/platform/graphics/SimpleFontData.h"
34 34
35 #include <mlang.h> 35 #include <mlang.h>
36 #include <objidl.h> 36 #include <objidl.h>
37 #include <unicode/uchar.h> 37 #include <unicode/uchar.h>
38 #include <unicode/unorm.h> 38 #include <unicode/unorm.h>
39 #include "core/platform/graphics/FloatRect.h"
40 #include "core/platform/graphics/Font.h" 39 #include "core/platform/graphics/Font.h"
41 #include "core/platform/graphics/FontCache.h" 40 #include "core/platform/graphics/FontCache.h"
42 #include "core/platform/graphics/FontDescription.h" 41 #include "core/platform/graphics/FontDescription.h"
43 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h" 42 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h"
44 #include "core/platform/win/HWndDC.h" 43 #include "core/platform/win/HWndDC.h"
44 #include "platform/geometry/FloatRect.h"
45 #include "wtf/MathExtras.h" 45 #include "wtf/MathExtras.h"
46 46
47 namespace WebCore { 47 namespace WebCore {
48 48
49 void SimpleFontData::platformInit() 49 void SimpleFontData::platformInit()
50 { 50 {
51 if (!m_platformData.size()) { 51 if (!m_platformData.size()) {
52 m_fontMetrics.reset(); 52 m_fontMetrics.reset();
53 m_avgCharWidth = 0; 53 m_avgCharWidth = 0;
54 m_maxCharWidth = 0; 54 m_maxCharWidth = 0;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 LOG_ERROR("Unable to get the char width after second attempt"); 172 LOG_ERROR("Unable to get the char width after second attempt");
173 } 173 }
174 } 174 }
175 175
176 SelectObject(dc, oldFont); 176 SelectObject(dc, oldFont);
177 177
178 return static_cast<float>(width); 178 return static_cast<float>(width);
179 } 179 }
180 180
181 } // namespace WebCore 181 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698