SkImage-only bitmap patterns

Source/platform/graphics/Pattern.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/Pattern.h"
 
-#include "platform/graphics/BitmapPattern.h"
+#include "platform/graphics/ImagePattern.h"
 #include "platform/graphics/PicturePattern.h"
-#include "platform/graphics/StaticBitmapPattern.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include <v8.h>
 
 namespace blink {
 
-PassRefPtr<Pattern> Pattern::createBitmapPattern(PassRefPtr<Image> tileImage, RepeatMode repeatMode)
+PassRefPtr<Pattern> Pattern::createImagePattern(PassRefPtr<Image> tileImage, RepeatMode repeatMode)
 {
-    // TODO(fmalita): do we still need BitmapPattern at all?
-    if (tileImage->isBitmapImage())
-        return BitmapPattern::create(tileImage, repeatMode);
-
-    return StaticBitmapPattern::create(tileImage, repeatMode);
+    return ImagePattern::create(tileImage, repeatMode);
 }
 
 PassRefPtr<Pattern> Pattern::createPicturePattern(PassRefPtr<const SkPicture> picture,
     RepeatMode repeatMode)
 {
     return PicturePattern::create(picture, repeatMode);
 }
 
 Pattern::Pattern(RepeatMode repeatMode, int64_t externalMemoryAllocated)
     : m_repeatMode(repeatMode)
@@ skipping 28 matching lines @@
 void Pattern::adjustExternalMemoryAllocated(int64_t delta)
 {
     delta = std::max(-m_externalMemoryAllocated, delta);
 
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(delta);
 
     m_externalMemoryAllocated += delta;
 }
 
 } // namespace blink