Fix name colision on FontFaceSet for jumbo build

Bug: 
Change-Id: I114937245d63413fa343446898176a766978e99c
Reviewed-on: https://chromium-review.googlesource.com/747524Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512946}

third_party/WebKit/Source/core/css/FontFaceSet.cpp

@@ -10,6 +10,9 @@
 
 namespace blink {
 
+const int FontFaceSet::kDefaultFontSize = 10;
+const char FontFaceSet::kDefaultFontFamily[] = "sans-serif";
+
 void FontFaceSet::Suspend() {
   async_runner_->Suspend();
 }

third_party/WebKit/Source/core/css/FontFaceSet.h

@@ -83,6 +83,9 @@ class CORE_EXPORT FontFaceSet : public EventTargetWithInlineData,
   virtual void Trace(blink::Visitor*);
 
  protected:
+  static const int kDefaultFontSize;
+  static const char kDefaultFontFamily[];
+
   virtual bool ResolveFontStyle(const String&, Font&) = 0;
   virtual bool InActiveContext() const = 0;
   virtual FontSelector* GetFontSelector() const = 0;

third_party/WebKit/Source/core/css/FontFaceSetDocument.cpp

@@ -43,9 +43,6 @@
 
 namespace blink {
 
-static const int kDefaultFontSize = 10;
-static const char kDefaultFontFamily[] = "sans-serif";
-
 FontFaceSetDocument::FontFaceSetDocument(Document& document)
     : FontFaceSet(document), Supplement<Document>(document) {
   SuspendIfNeeded();
@@ -158,12 +155,12 @@ bool FontFaceSetDocument::ResolveFontStyle(const String& font_string,
   scoped_refptr<ComputedStyle> style = ComputedStyle::Create();
 
   FontFamily font_family;
-  font_family.SetFamily(kDefaultFontFamily);
+  font_family.SetFamily(FontFaceSet::kDefaultFontFamily);
 
   FontDescription default_font_description;
   default_font_description.SetFamily(font_family);
-  default_font_description.SetSpecifiedSize(kDefaultFontSize);
-  default_font_description.SetComputedSize(kDefaultFontSize);
+  default_font_description.SetSpecifiedSize(FontFaceSet::kDefaultFontSize);
+  default_font_description.SetComputedSize(FontFaceSet::kDefaultFontSize);
 
   style->SetFontDescription(default_font_description);
 

third_party/WebKit/Source/core/css/FontFaceSetWorker.cpp

@@ -21,9 +21,6 @@
 
 namespace blink {
 
-static const int kDefaultFontSize = 10;
-static const char kDefaultFontFamily[] = "sans-serif";
-
 FontFaceSetWorker::FontFaceSetWorker(WorkerGlobalScope& worker)
     : FontFaceSet(worker), Supplement<WorkerGlobalScope>(worker) {
   SuspendIfNeeded();
@@ -86,12 +83,12 @@ bool FontFaceSetWorker::ResolveFontStyle(const String& font_string,
     return false;
 
   FontFamily font_family;
-  font_family.SetFamily(kDefaultFontFamily);
+  font_family.SetFamily(FontFaceSet::kDefaultFontFamily);
 
   FontDescription default_font_description;
   default_font_description.SetFamily(font_family);
-  default_font_description.SetSpecifiedSize(kDefaultFontSize);
-  default_font_description.SetComputedSize(kDefaultFontSize);
+  default_font_description.SetSpecifiedSize(FontFaceSet::kDefaultFontSize);
+  default_font_description.SetComputedSize(FontFaceSet::kDefaultFontSize);
 
   FontDescription description = FontStyleResolver::ComputeFont(
       *parsed_style, GetWorker()->GetFontSelector());