Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Side by Side Diff: Source/platform/exported/WebImageSkia.cpp

Issue 458313005: Cleanup namespace usage from animation to exported in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Cleanup namespace usage from animation to exported in platform/ Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 #include "platform/graphics/skia/NativeImageSkia.h" 37 #include "platform/graphics/skia/NativeImageSkia.h"
38 #include "platform/image-decoders/ImageDecoder.h" 38 #include "platform/image-decoders/ImageDecoder.h"
39 #include "public/platform/WebData.h" 39 #include "public/platform/WebData.h"
40 #include "public/platform/WebSize.h" 40 #include "public/platform/WebSize.h"
41 #include "wtf/OwnPtr.h" 41 #include "wtf/OwnPtr.h"
42 #include "wtf/PassOwnPtr.h" 42 #include "wtf/PassOwnPtr.h"
43 #include "wtf/PassRefPtr.h" 43 #include "wtf/PassRefPtr.h"
44 #include "wtf/Vector.h" 44 #include "wtf/Vector.h"
45 #include <algorithm> 45 #include <algorithm>
46 46
47 using namespace blink;
48
49 namespace blink { 47 namespace blink {
50 48
51 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) 49 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)
52 { 50 {
53 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data); 51 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
54 OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageSource ::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored)); 52 OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageSource ::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored));
55 if (!decoder) 53 if (!decoder)
56 return WebImage(); 54 return WebImage();
57 55
58 decoder->setData(buffer.get(), true); 56 decoder->setData(buffer.get(), true);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 { 158 {
161 RefPtr<NativeImageSkia> p; 159 RefPtr<NativeImageSkia> p;
162 if (image && (p = image->nativeImageForCurrentFrame())) 160 if (image && (p = image->nativeImageForCurrentFrame()))
163 assign(p->bitmap()); 161 assign(p->bitmap());
164 else 162 else
165 reset(); 163 reset();
166 return *this; 164 return *this;
167 } 165 }
168 166
169 } // namespace blink 167 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/exported/WebHTTPLoadInfo.cpp ('k') | Source/platform/exported/WebMediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698