Rename enums/functions that collide in chromium style.

third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 39 matching lines @@
         , m_resourceWidth(UninitializedDescriptor)
         , m_resourceHeight(UninitializedDescriptor)
     {
     }
 
     bool hasDensity() const { return m_density >= 0; }
     bool hasWidth() const { return m_resourceWidth >= 0; }
     bool hasHeight() const { return m_resourceHeight >= 0; }
 
     float density() const { ASSERT(hasDensity()); return m_density; }
-    unsigned resourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }
+    unsigned getResourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }
     unsigned resourceHeight() const { ASSERT(hasHeight()); return m_resourceHeight; }
 
     void setResourceWidth(int width) { ASSERT(width >= 0); m_resourceWidth = (unsigned)width; }
     void setResourceHeight(int height) { ASSERT(height >= 0); m_resourceHeight = (unsigned)height; }
     void setDensity(float densityToSet) { ASSERT(densityToSet >= 0); m_density = densityToSet; }
 
 private:
     float m_density;
     int m_resourceWidth;
     int m_resourceHeight;
@@ skipping 10 matching lines @@
     ImageCandidate()
         : m_density(1.0)
         , m_resourceWidth(UninitializedDescriptor)
         , m_originAttribute(SrcsetOrigin)
     {
     }
 
     ImageCandidate(const String& source, unsigned start, unsigned length, const DescriptorParsingResult& result, OriginAttribute originAttribute)
         : m_string(source.createView(start, length))
         , m_density(result.hasDensity()?result.density():UninitializedDescriptor)
-        , m_resourceWidth(result.hasWidth()?result.resourceWidth():UninitializedDescriptor)
+        , m_resourceWidth(result.hasWidth()?result.getResourceWidth():UninitializedDescriptor)
         , m_originAttribute(originAttribute)
     {
     }
 
     String toString() const
     {
         return String(m_string.toString());
     }
 
     AtomicString url() const
     {
         return AtomicString(m_string.toString());
     }
 
     void setDensity(float factor)
     {
         m_density = factor;
     }
 
     float density() const
     {
         return m_density;
     }
 
-    int resourceWidth() const
+    int getResourceWidth() const
     {
         return m_resourceWidth;
     }
 
     bool srcOrigin() const
     {
         return (m_originAttribute == SrcOrigin);
     }
 
     inline bool isEmpty() const
@@ skipping 10 matching lines @@
 
 ImageCandidate bestFitSourceForSrcsetAttribute(float deviceScaleFactor, float sourceSize, const String& srcsetAttribute, Document* = nullptr);
 
 CORE_EXPORT ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, float sourceSize, const String& srcAttribute, const String& srcsetAttribute, Document* = nullptr);
 
 String bestFitSourceForImageAttributes(float deviceScaleFactor, float sourceSize, const String& srcAttribute, ImageCandidate& srcsetImageCandidate);
 
 } // namespace blink
 
 #endif