Merge image sizing algorithms

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

 /*
  * Copyright (C) 2011 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 36 matching lines @@
     {
         return adoptRefWillBeNoop(new CSSCrossfadeValue(fromValue, toValue, percentageValue));
     }
 
     ~CSSCrossfadeValue();
 
     String customCSSText() const;
 
     PassRefPtr<Image> image(const LayoutObject*, const IntSize&);
     bool isFixedSize() const { return true; }
-    IntSize fixedSize(const LayoutObject*);
+    IntSize fixedSize(const LayoutObject*, const FloatSize&);
 
     bool isPending() const;
     bool knownToBeOpaque(const LayoutObject*) const;
 
     void loadSubimages(Document*);
 
     bool hasFailedOrCanceledSubresources() const;
 
     bool equals(const CSSCrossfadeValue&) const;
 
@@ skipping 39 matching lines @@
     RefPtr<Image> m_generatedImage;
 
     CrossfadeSubimageObserverProxy m_crossfadeSubimageObserver;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, isCrossfadeValue());
 
 } // namespace blink
 
 #endif // CSSCrossfadeValue_h