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

Side by Side Diff: Source/web/WebImageSkia.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebImageDecoder.cpp ('k') | Source/web/WebInputElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 27 matching lines...) Expand all
38 #include "public/platform/WebData.h" 38 #include "public/platform/WebData.h"
39 #include "public/platform/WebImage.h" 39 #include "public/platform/WebImage.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 45
46 using namespace WebCore; 46 using namespace WebCore;
47 47
48 namespace WebKit { 48 namespace blink {
49 49
50 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) 50 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)
51 { 51 {
52 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data); 52 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
53 OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageSource ::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored)); 53 OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageSource ::AlphaPremultiplied, ImageSource::GammaAndColorProfileIgnored));
54 if (!decoder) 54 if (!decoder)
55 return WebImage(); 55 return WebImage();
56 56
57 decoder->setData(buffer.get(), true); 57 decoder->setData(buffer.get(), true);
58 if (!decoder->isSizeAvailable()) 58 if (!decoder->isSizeAvailable())
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 WebImage& WebImage::operator=(const PassRefPtr<Image>& image) 158 WebImage& WebImage::operator=(const PassRefPtr<Image>& image)
159 { 159 {
160 RefPtr<NativeImageSkia> p; 160 RefPtr<NativeImageSkia> p;
161 if (image && (p = image->nativeImageForCurrentFrame())) 161 if (image && (p = image->nativeImageForCurrentFrame()))
162 assign(p->bitmap()); 162 assign(p->bitmap());
163 else 163 else
164 reset(); 164 reset();
165 return *this; 165 return *this;
166 } 166 }
167 167
168 } // namespace WebKit 168 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebImageDecoder.cpp ('k') | Source/web/WebInputElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698