Changeset 85135 in webkit
- Timestamp:
- Apr 27, 2011 6:42:20 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r85133 r85135 1 2011-04-27 James Robinson <jamesr@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 Fix OwnPtr strict issues in chromium linux build 6 https://bugs.webkit.org/show_bug.cgi?id=59664 7 8 * platform/graphics/chromium/ComplexTextControllerLinux.cpp: 9 (WebCore::ComplexTextController::getNormalizedTextRun): 10 * platform/graphics/skia/ImageBufferSkia.cpp: 11 (WebCore::ImageBuffer::ImageBuffer): 12 * platform/graphics/skia/PlatformContextSkia.cpp: 13 (WebCore::PlatformContextSkia::PlatformContextSkia): 14 1 15 2011-04-27 Chris Rogers <crogers@google.com> 2 16 -
trunk/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.cpp
r85013 r85135 395 395 normalizeSpacesAndMirrorChars(sourceText, originalRun.rtl(), normalizedBuffer.get(), normalizedBufferLength); 396 396 397 normalizedRun .set(new TextRun(originalRun));397 normalizedRun = adoptPtr(new TextRun(originalRun)); 398 398 normalizedRun->setText(normalizedBuffer.get(), normalizedBufferLength); 399 399 return *normalizedRun; -
trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
r84374 r85135 75 75 m_data.m_canvas = canvas; 76 76 m_data.m_platformContext.setCanvas(m_data.m_canvas.get()); 77 m_context .set(new GraphicsContext(&m_data.m_platformContext));77 m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext)); 78 78 m_context->platformContext()->setDrawingToImageBuffer(true); 79 79 -
trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
r85017 r85135 216 216 , m_drawingToImageBuffer(false) 217 217 , m_accelerationMode(NoAcceleration) 218 #if ENABLE(ACCELERATED_2D_CANVAS)219 , m_gpuCanvas(0)220 #endif221 218 , m_backingStoreState(None) 222 219 { -
trunk/Source/WebKit/chromium/ChangeLog
r85126 r85135 1 2011-04-27 James Robinson <jamesr@chromium.org> 2 3 Reviewed by Adam Barth. 4 5 Fix OwnPtr strict issues in chromium linux build 6 https://bugs.webkit.org/show_bug.cgi?id=59664 7 8 * src/WebImageDecoder.cpp: 9 (WebKit::WebImageDecoder::getFrameAtIndex): 10 * src/WebImageSkia.cpp: 11 (WebKit::WebImage::fromData): 12 1 13 2011-04-27 Adam Barth <abarth@webkit.org> 2 14 -
trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp
r75748 r85135 41 41 #if WEBKIT_USING_SKIA 42 42 #include <wtf/OwnPtr.h> 43 #include <wtf/PassOwnPtr.h> 44 #endif 45 43 46 #include <wtf/PassRefPtr.h> 44 #endif45 47 46 48 using namespace WebCore; … … 111 113 return WebImage(); 112 114 #if WEBKIT_USING_SKIA 113 OwnPtr<NativeImageSkia> image(frameBuffer->asNewNativeImage());115 OwnPtr<NativeImageSkia> image = adoptPtr(frameBuffer->asNewNativeImage()); 114 116 return WebImage(*image); 115 117 #elif WEBKIT_USING_CG -
trunk/Source/WebKit/chromium/src/WebImageSkia.cpp
r50720 r85135 41 41 42 42 #include <wtf/OwnPtr.h> 43 #include <wtf/PassOwnPtr.h> 43 44 #include <wtf/PassRefPtr.h> 44 45 … … 77 78 } 78 79 79 OwnPtr<NativeImageSkia> frame (source.createFrameAtIndex(index));80 if (!frame .get())80 OwnPtr<NativeImageSkia> frame = adoptPtr(source.createFrameAtIndex(index)); 81 if (!frame) 81 82 return WebImage(); 82 83
Note: See TracChangeset
for help on using the changeset viewer.