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

Side by Side Diff: third_party/WebKit/Source/web/WebImageDecoder.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 19 matching lines...) Expand all
30 30
31 #include "public/web/WebImageDecoder.h" 31 #include "public/web/WebImageDecoder.h"
32 32
33 #include "platform/SharedBuffer.h" 33 #include "platform/SharedBuffer.h"
34 #include "platform/image-decoders/bmp/BMPImageDecoder.h" 34 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
35 #include "platform/image-decoders/ico/ICOImageDecoder.h" 35 #include "platform/image-decoders/ico/ICOImageDecoder.h"
36 #include "public/platform/Platform.h" 36 #include "public/platform/Platform.h"
37 #include "public/platform/WebData.h" 37 #include "public/platform/WebData.h"
38 #include "public/platform/WebImage.h" 38 #include "public/platform/WebImage.h"
39 #include "public/platform/WebSize.h" 39 #include "public/platform/WebSize.h"
40 #include "wtf/OwnPtr.h"
41 #include "wtf/PassOwnPtr.h"
40 #include "wtf/PassRefPtr.h" 42 #include "wtf/PassRefPtr.h"
41 43
42 namespace blink { 44 namespace blink {
43 45
44 void WebImageDecoder::reset() 46 void WebImageDecoder::reset()
45 { 47 {
46 delete m_private; 48 delete m_private;
47 } 49 }
48 50
49 void WebImageDecoder::init(Type type) 51 void WebImageDecoder::init(Type type)
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const 104 WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const
103 { 105 {
104 DCHECK(m_private); 106 DCHECK(m_private);
105 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); 107 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index);
106 if (!frameBuffer) 108 if (!frameBuffer)
107 return WebImage(); 109 return WebImage();
108 return WebImage(frameBuffer->bitmap()); 110 return WebImage(frameBuffer->bitmap());
109 } 111 }
110 112
111 } // namespace blink 113 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebHelperPluginImpl.h ('k') | third_party/WebKit/Source/web/WebKit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698