Merge image sizing algorithms

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

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 #include "core/css/CSSValue.h"
 #include "platform/geometry/IntSizeHash.h"
 #include "wtf/HashCountedSet.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class Document;
 class Image;
 class LayoutObject;
+class FloatSize;
 
 struct SizeAndCount {
     DISALLOW_NEW();
     SizeAndCount(IntSize newSize = IntSize(), int newCount = 0)
         : size(newSize)
         , count(newCount)
     {
     }
 
     IntSize size;
     int count;
 };
 
 using LayoutObjectSizeCountMap = HashMap<const LayoutObject*, SizeAndCount>;
 
 class CORE_EXPORT CSSImageGeneratorValue : public CSSValue {
 public:
     ~CSSImageGeneratorValue();
 
     void addClient(const LayoutObject*, const IntSize&);
     void removeClient(const LayoutObject*);
     PassRefPtr<Image> image(const LayoutObject*, const IntSize&);
 
     bool isFixedSize() const;
-    IntSize fixedSize(const LayoutObject*);
+    IntSize fixedSize(const LayoutObject*, const FloatSize& defaultObjectSize);
 
     bool isPending() const;
     bool knownToBeOpaque(const LayoutObject*) const;
 
     void loadSubimages(Document*);
 
     PassRefPtrWillBeRawPtr<CSSImageGeneratorValue> valueWithURLsMadeAbsolute();
 
     DEFINE_INLINE_TRACE_AFTER_DISPATCH() { CSSValue::traceAfterDispatch(visitor); }
 
@@ skipping 14 matching lines @@
     // there are clients in the LayoutObjectSizeCountMap.
     SelfKeepAlive<CSSImageGeneratorValue> m_keepAlive;
 #endif
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageGeneratorValue, isImageGeneratorValue());
 
 } // namespace blink
 
 #endif // CSSImageGeneratorValue_h