Shrink some font-related classes and enums
Created attachment 345058 [details] Patch
Attachment 345058 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/FontDescription.cpp:59: Code inside a namespace should not be indented. [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:198: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 24 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 345059 [details] Patch
Attachment 345059 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/FontDescription.cpp:59: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 26 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 345060 [details] Patch
Attachment 345060 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/FontDescription.cpp:59: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 28 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 345060 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345060&action=review r=me assuming you fix Windows > Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:58 > + uintptr_t flags = static_cast<uintptr_t>(static_cast<unsigned>(m_widthVariant) << 6 | m_isHashTableDeletedValue << 5 | static_cast<unsigned>(m_textRenderingMode) << 3 | static_cast<unsigned>(m_orientation) << 2 | m_syntheticBold << 1 | m_syntheticOblique); Nit: this is now long enough to break up into separate lines. > Source/WebCore/platform/text/TextFlags.h:363 > +enum class FontSmallCaps : uint8_t { Are enum classes required for the : uint8_t?
Created attachment 345094 [details] Patch
Attachment 345094 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/FontDescription.cpp:59: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 29 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 345094 [details] Patch Clearing flags on attachment: 345094 Committed r233851: <https://trac.webkit.org/changeset/233851>
Comment on attachment 345094 [details] Patch Attachment 345094 [details] did not pass win-ews (win): Output: https://webkit-queues.webkit.org/results/8553084 New failing tests: http/tests/preload/onload_event.html
Created attachment 345104 [details] Archive of layout-test-results from ews206 for win-future The attached test failures were seen while running run-webkit-tests on the win-ews. Bot: ews206 Port: win-future Platform: CYGWIN_NT-6.1-2.9.0-0.318-5-3-x86_64-64bit
Comment on attachment 345094 [details] Patch Rejecting attachment 345094 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 345094, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 5000 characters of output: atform/graphics/FontDescription.cpp.rej patching file Source/WebCore/platform/graphics/FontDescription.h Hunk #1 FAILED at 122. Hunk #2 FAILED at 282. Hunk #3 FAILED at 302. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/FontDescription.h.rej patching file Source/WebCore/platform/graphics/FontPlatformData.h Hunk #1 FAILED at 76. Hunk #2 FAILED at 155. Hunk #3 FAILED at 248. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/FontPlatformData.h.rej patching file Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp Hunk #1 FAILED at 542. Hunk #2 FAILED at 566. Hunk #3 FAILED at 653. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp.rej patching file Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm Hunk #1 FAILED at 95. Hunk #2 FAILED at 143. Hunk #3 FAILED at 194. Hunk #4 FAILED at 242. Hunk #5 FAILED at 515. 5 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm.rej patching file Source/WebCore/platform/graphics/cocoa/FontCocoa.mm Hunk #1 FAILED at 163. Hunk #2 FAILED at 179. Hunk #3 FAILED at 572. Hunk #4 FAILED at 583. 4 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/cocoa/FontCocoa.mm.rej patching file Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm Hunk #1 FAILED at 55. Hunk #2 FAILED at 86. Hunk #3 FAILED at 157. Hunk #4 FAILED at 201. 4 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm.rej patching file Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp Hunk #1 FAILED at 303. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp.rej patching file Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp Hunk #1 FAILED at 110. Hunk #2 FAILED at 122. Hunk #3 FAILED at 183. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp.rej patching file Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp Hunk #1 FAILED at 89. Hunk #2 FAILED at 208. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp.rej patching file Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp Hunk #1 FAILED at 47. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp.rej patching file Source/WebCore/platform/graphics/win/FontCGWin.cpp Hunk #1 FAILED at 133. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/win/FontCGWin.cpp.rej patching file Source/WebCore/platform/graphics/win/FontCascadeDirect2D.cpp Hunk #1 FAILED at 51. Hunk #2 FAILED at 111. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/win/FontCascadeDirect2D.cpp.rej patching file Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp Hunk #1 FAILED at 64. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp.rej patching file Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp Hunk #1 FAILED at 151. Hunk #2 FAILED at 177. Hunk #3 FAILED at 214. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp.rej patching file Source/WebCore/platform/text/TextFlags.h Hunk #1 FAILED at 27. Hunk #2 FAILED at 348. Hunk #3 FAILED at 358. 3 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/platform/text/TextFlags.h.rej patching file Source/WebCore/rendering/RenderCombineText.cpp Hunk #1 FAILED at 122. Hunk #2 FAILED at 140. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderCombineText.cpp.rej patching file Source/WebCore/rendering/RenderLayer.cpp Hunk #1 FAILED at 6405. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/RenderLayer.cpp.rej patching file Source/WebCore/rendering/TextPainter.cpp Hunk #1 FAILED at 46. Hunk #2 FAILED at 130. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/rendering/TextPainter.cpp.rej patching file Source/WebCore/rendering/TextPainter.h Hunk #1 FAILED at 104. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/TextPainter.h.rej patching file Source/WebCore/rendering/style/RenderStyle.cpp Hunk #1 FAILED at 2015. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/style/RenderStyle.cpp.rej patching file Source/WebCore/rendering/svg/RenderSVGInlineText.cpp Hunk #1 FAILED at 231. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/svg/RenderSVGInlineText.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/8560257
This landed.
<rdar://problem/42321150>