Changeset 214730 in webkit

Timestamp:

Apr 2, 2017, 8:13:42 PM (8 years ago)

Author:

ap@apple.com

Message:

Build fix for
Add missing text styles
​https://bugs.webkit.org/show_bug.cgi?id=170295

Source/WebCore:

• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::cachedSystemFontDescription):
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):

LayoutTests:

• platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeIOS.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Build fix for
+        Add missing text styles
+        https://bugs.webkit.org/show_bug.cgi?id=170295
+
+        * platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt:
+
 2017-04-02  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/platform/ios/ios/fast/text/opticalFontWithTextStyle-expected.txt

@@ -1 @@
-layer at (0,0) size 800x663
+layer at (0,0) size 800x629
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x663
-  RenderBlock {HTML} at (0,0) size 800x663
-    RenderBody {BODY} at (8,15) size 784x640
+layer at (0,0) size 800x629
+  RenderBlock {HTML} at (0,0) size 800x629
+    RenderBody {BODY} at (8,15) size 784x606
       RenderBlock {DIV} at (0,0) size 784x24
         RenderText {#text} at (0,1) size 106x22
@@ -19 +19 @@
         RenderText {#text} at (0,0) size 92x25
           text run at (0,0) width 92: "T3 / Title3"
-      RenderBlock {DIV} at (0,205) size 784x50
-        RenderText {#text} at (0,1) size 187x47
-          text run at (0,1) width 187: "T4 / Title4"
-      RenderBlock {DIV} at (0,270) size 784x24
+      RenderBlock {DIV} at (0,205) size 784x16
+        RenderText {#text} at (0,0) size 56x15
+          text run at (0,0) width 56: "T4 / Title4"
+      RenderBlock {DIV} at (0,236) size 784x24
         RenderText {#text} at (0,1) size 707x22
           text run at (0,1) width 707: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
-      RenderBlock {DIV} at (0,309) size 784x26
+      RenderBlock {DIV} at (0,275) size 784x26
         RenderText {#text} at (0,2) size 737x22
           text run at (0,2) width 737: "Tall Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
-      RenderBlock {DIV} at (0,350) size 784x22
+      RenderBlock {DIV} at (0,316) size 784x22
         RenderText {#text} at (0,1) size 85x19
           text run at (0,1) width 85: "Subheadline"
-      RenderBlock {DIV} at (0,387) size 784x20
+      RenderBlock {DIV} at (0,353) size 784x20
         RenderText {#text} at (0,1) size 83x17
           text run at (0,1) width 83: "FN / Footnote"
-      RenderBlock {DIV} at (0,422) size 784x17
+      RenderBlock {DIV} at (0,388) size 784x17
         RenderText {#text} at (0,1) size 96x15
           text run at (0,1) width 96: "Cap 1 / Caption 1"
-      RenderBlock {DIV} at (0,454) size 784x14
+      RenderBlock {DIV} at (0,420) size 784x14
         RenderText {#text} at (0,0) size 92x14
           text run at (0,0) width 92: "Cap 2 / Caption 2"
-      RenderBlock {DIV} at (0,483) size 784x22
+      RenderBlock {DIV} at (0,449) size 784x22
         RenderText {#text} at (0,0) size 154x22
           text run at (0,0) width 154: "Short H1 / Headline"
-      RenderBlock {DIV} at (0,520) size 784x22
+      RenderBlock {DIV} at (0,486) size 784x22
         RenderText {#text} at (0,0) size 753x22
           text run at (0,0) width 753: "Short Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
-      RenderBlock {DIV} at (0,557) size 784x20
+      RenderBlock {DIV} at (0,523) size 784x20
         RenderText {#text} at (0,0) size 127x19
           text run at (0,0) width 127: "Short Subheadline"
-      RenderBlock {DIV} at (0,592) size 784x18
+      RenderBlock {DIV} at (0,558) size 784x18
         RenderText {#text} at (0,0) size 120x17
           text run at (0,0) width 120: "Short FN / Footnote"
-      RenderBlock {DIV} at (0,625) size 784x15
+      RenderBlock {DIV} at (0,591) size 784x15
         RenderText {#text} at (0,0) size 130x15
           text run at (0,0) width 130: "Short Cap 1 / Caption 1"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Build fix for
+        Add missing text styles
+        https://bugs.webkit.org/show_bug.cgi?id=170295
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::cachedSystemFontDescription):
+        (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+
 2017-04-01  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1142 +1142 @@
     static NeverDestroyed<FontCascadeDescription> title2Font;
     static NeverDestroyed<FontCascadeDescription> title3Font;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     static NeverDestroyed<FontCascadeDescription> title4Font;
 #endif
@@ -1180 +1180 @@
     case CSSValueAppleSystemTitle3:
         return title3Font;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     case CSSValueAppleSystemTitle4:
         return title4Font;
@@ -1242 +1242 @@
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
         break;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     case CSSValueAppleSystemTitle4:
         textStyle = kCTUIFontTextStyleTitle4;