Merge image sizing algorithms

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

 /*
  * 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 137 matching lines @@
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->isFixedSize();
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->isFixedSize();
     default:
         ASSERT_NOT_REACHED();
     }
     return false;
 }
 
-IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject)
+IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject, const FloatSize& defaultObjectSize)
 {
     switch (classType()) {
     case CrossfadeClass:
-        return toCSSCrossfadeValue(this)->fixedSize(layoutObject);
+        return toCSSCrossfadeValue(this)->fixedSize(layoutObject, defaultObjectSize);
     case LinearGradientClass:
         return toCSSLinearGradientValue(this)->fixedSize(layoutObject);
     case RadialGradientClass:
         return toCSSRadialGradientValue(this)->fixedSize(layoutObject);
     default:
         ASSERT_NOT_REACHED();
     }
     return IntSize();
 }
 
@@ skipping 38 matching lines @@
         break;
     case RadialGradientClass:
         toCSSRadialGradientValue(this)->loadSubimages(document);
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink