Changeset 102199 in webkit

Timestamp:

Dec 6, 2011, 5:29:05 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r97517.

Location:

branches/safari-534.53-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/GraphicsContextMac.mm (modified) (4 diffs)

branches/safari-534.53-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 97517
+
+    2011-10-14  Beth Dakin  <bdakin@apple.com>
+
+            https://bugs.webkit.org/show_bug.cgi?id=70148
+            Should switch to CoreUI version of CorrectionDot, GrammarDot, and SpellingDot
+            -and corresponding-
+            <rdar://problem/10208281>
+
+            Reviewed by Anders Carlsson.
+
+            Use NS*Dot whenever it's available, and fallback to *Dot only when it is not.
+            * platform/graphics/mac/GraphicsContextMac.mm:
+            (WebCore::createPatternColor):
+            (WebCore::GraphicsContext::drawLineForTextChecking):
+
 2011-12-06  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm

@@ -83 +83 @@
 
 
-static NSColor* createPatternColor(NSString* name, NSColor* defaultColor, bool& usingDot)
+static NSColor* createPatternColor(NSString* firstChoiceName, NSString* secondChoiceName, NSColor* defaultColor, bool& usingDot)
 {
-    NSImage *image = [NSImage imageNamed:name];
+    // Eventually we should be able to get rid of the secondChoiceName. For the time being we need both to keep
+    // this working on all platforms.
+    NSImage *image = [NSImage imageNamed:firstChoiceName];
+    if (!image)
+        image = [NSImage imageNamed:secondChoiceName];
     ASSERT(image); // if image is not available, we want to know
     NSColor *color = (image ? [NSColor colorWithPatternImage:image] : nil);
@@ -112 +116 @@
             // Constants for spelling pattern color.
             static bool usingDotForSpelling = false;
-            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, spellingPatternColor, (createPatternColor(@"SpellingDot", [NSColor redColor], usingDotForSpelling)));
+            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, spellingPatternColor, (createPatternColor(@"NSSpellingDot", @"SpellingDot", [NSColor redColor], usingDotForSpelling)));
             usingDot = usingDotForSpelling;
             patternColor = spellingPatternColor.get();
@@ -121 +125 @@
             // Constants for grammar pattern color.
             static bool usingDotForGrammar = false;
-            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, grammarPatternColor, (createPatternColor(@"GrammarDot", [NSColor greenColor], usingDotForGrammar)));
+            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, grammarPatternColor, (createPatternColor(@"NSGrammarDot", @"GrammarDot", [NSColor greenColor], usingDotForGrammar)));
             usingDot = usingDotForGrammar;
             patternColor = grammarPatternColor.get();
@@ -132 +136 @@
             // Constants for spelling pattern color.
             static bool usingDotForSpelling = false;
-            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, spellingPatternColor, (createPatternColor(@"CorrectionDot", [NSColor blueColor], usingDotForSpelling)));
+            DEFINE_STATIC_LOCAL(RetainPtr<NSColor>, spellingPatternColor, (createPatternColor(@"NSCorrectionDot", @"CorrectionDot", [NSColor blueColor], usingDotForSpelling)));
             usingDot = usingDotForSpelling;
             patternColor = spellingPatternColor.get();