Unreviewed post-review feedback on r187797
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Aug 2015 03:42:00 +0000 (03:42 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Aug 2015 03:42:00 +0000 (03:42 +0000)
The correct terminology is "registered" instead of "activated."

Source/WebCore:

No new tests because there is no behavior change.

* platform/graphics/FontPlatformData.h:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::registeredFont):
(WebCore::FontPlatformData::activatedFont): Deleted.

Source/WebKit/mac:

* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateFontPanel]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebHTMLView.mm

index 5b0492c..ac8a8a3 100644 (file)
@@ -1,5 +1,18 @@
 2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        Unreviewed post-review feedback on r187797
+
+        The correct terminology is "registered" instead of "activated."
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::registeredFont):
+        (WebCore::FontPlatformData::activatedFont): Deleted.
+
+2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
         Clean up casts between NSFont*s and CTFontRefs
         https://bugs.webkit.org/show_bug.cgi?id=147618
 
index 9787a37..5853883 100644 (file)
@@ -108,7 +108,7 @@ public:
     bool useGDI() const { return m_useGDI; }
 #elif PLATFORM(COCOA)
     CTFontRef font() const { return m_font.get(); }
-    WEBCORE_EXPORT CTFontRef activatedFont() const; // Returns nullptr iff the font is not activated (otherwise returns font()).
+    WEBCORE_EXPORT CTFontRef registeredFont() const; // Returns nullptr iff the font is not registered, such as web fonts (otherwise returns font()).
     void setFont(CTFontRef);
 
     CTFontRef ctFont() const;
index c5fdf92..dc9f187 100644 (file)
@@ -91,7 +91,7 @@ bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
     return m_cgFont == other.m_cgFont;
 }
 
-CTFontRef FontPlatformData::activatedFont() const
+CTFontRef FontPlatformData::registeredFont() const
 {
     CTFontRef platformFont = font();
     ASSERT(platformFont);
index 98ee8ec..5cd5e1c 100644 (file)
@@ -1,5 +1,14 @@
 2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        Unreviewed post-review feedback on r187797
+
+        The correct terminology is "registered" instead of "activated."
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _updateFontPanel]):
+
+2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
         Clean up casts between NSFont*s and CTFontRefs
         https://bugs.webkit.org/show_bug.cgi?id=147618
 
index d35e0ae..a8e921c 100644 (file)
@@ -5485,7 +5485,7 @@ static BOOL writingDirectionKeyBindingsEnabled()
     NSDictionary *attributes = nil;
     if (Frame* coreFrame = core([self _frame])) {
         if (const Font* fd = coreFrame->editor().fontForSelection(multipleFonts))
-            font = (NSFont *)fd->platformData().activatedFont();
+            font = (NSFont *)fd->platformData().registeredFont();
         attributes = coreFrame->editor().fontAttributesForSelectionStart();
     }