Changeset 85420 in webkit

Timestamp:

May 1, 2011 10:47:30 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-05-01 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Fix OwnPtr strict issues in windows build
​https://bugs.webkit.org/show_bug.cgi?id=59878

• platform/graphics/ca/win/CACFLayerTreeHost.cpp: (WebCore::getDirtyRects):
• platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp: (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
• platform/graphics/win/WKCAImageQueue.cpp: (WebCore::WKCAImageQueue::WKCAImageQueue):
• platform/win/CursorWin.cpp: (WebCore::createSharedCursor):
• platform/win/PasteboardWin.cpp: (WebCore::Pasteboard::writeImage):

2011-05-01 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Fix OwnPtr strict issues in windows build
​https://bugs.webkit.org/show_bug.cgi?id=59878

• FullscreenVideoController.cpp: (FullscreenVideoController::FullscreenVideoController): (FullscreenVideoController::createHUDWindow):
• WebCoreSupport/WebInspectorClient.cpp: (WebInspectorClient::highlight):
• WebElementPropertyBag.cpp: (WebElementPropertyBag::WebElementPropertyBag):
• WebNodeHighlight.cpp: (WebNodeHighlight::update):
• WebNotificationCenter.cpp: (WebNotificationCenter::WebNotificationCenter):
• WebView.cpp: (WebView::close): (WebView::paint): (WebView::handleMouseEvent): (WebView::registerEmbeddedViewMIMEType):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/WKCAImageQueue.cpp (modified) (3 diffs)
• WebCore/platform/win/CursorWin.cpp (modified) (4 diffs)
• WebCore/platform/win/PasteboardWin.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/FullscreenVideoController.cpp (modified) (2 diffs)
• WebKit/win/WebCoreSupport/WebInspectorClient.cpp (modified) (1 diff)
• WebKit/win/WebElementPropertyBag.cpp (modified) (1 diff)
• WebKit/win/WebNodeHighlight.cpp (modified) (1 diff)
• WebKit/win/WebNotificationCenter.cpp (modified) (2 diffs)
• WebKit/win/WebView.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-01  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Fix OwnPtr strict issues in windows build
+        https://bugs.webkit.org/show_bug.cgi?id=59878
+
+        * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
+        (WebCore::getDirtyRects):
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
+        * platform/graphics/win/WKCAImageQueue.cpp:
+        (WebCore::WKCAImageQueue::WKCAImageQueue):
+        * platform/win/CursorWin.cpp:
+        (WebCore::createSharedCursor):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::writeImage):
+
 2011-05-01  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp

@@ -240 +240 @@
         return;
 
-    OwnPtr<HRGN> region(CreateRectRgn(0, 0, 0, 0));
+    OwnPtr<HRGN> region = adoptPtr(CreateRectRgn(0, 0, 0, 0));
     int regionType = GetUpdateRgn(window, region.get(), false);
     if (regionType != COMPLEXREGION) {

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

@@ -174 +174 @@
     , m_visible(false)
     , m_newFrameAvailable(false)
-    , m_movieClient(new MediaPlayerPrivateQuickTimeVisualContext::MovieClient(this))
-#if USE(ACCELERATED_COMPOSITING)
-    , m_layerClient(new MediaPlayerPrivateQuickTimeVisualContext::LayerClient(this))
+    , m_movieClient(adoptPtr(new MediaPlayerPrivateQuickTimeVisualContext::MovieClient(this)))
+#if USE(ACCELERATED_COMPOSITING)
+    , m_layerClient(adoptPtr(new MediaPlayerPrivateQuickTimeVisualContext::LayerClient(this)))
     , m_movieTransform(CGAffineTransformIdentity)
 #endif
-    , m_visualContextClient(new MediaPlayerPrivateQuickTimeVisualContext::VisualContextClient(this))
+    , m_visualContextClient(adoptPtr(new MediaPlayerPrivateQuickTimeVisualContext::VisualContextClient(this)))
     , m_delayingLoad(false)
     , m_privateBrowsing(false)

trunk/Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp

@@ -31 +31 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 
@@ -54 +55 @@
 
 WKCAImageQueue::WKCAImageQueue(uint32_t width, uint32_t height, uint32_t capacity)
-    : m_private(new WKCAImageQueuePrivate())
+    : m_private(adoptPtr(new WKCAImageQueuePrivate()))
 {
     m_private->m_imageQueue.adoptCF(wkCAImageQueueCreate(width, height, capacity));
@@ -60 +61 @@
 
 WKCAImageQueue::WKCAImageQueue(const WKCAImageQueue& o)
-    : m_private(new WKCAImageQueuePrivate())
+    : m_private(adoptPtr(new WKCAImageQueuePrivate()))
 {
     m_private->m_imageQueue = o.m_private->m_imageQueue;

trunk/Source/WebCore/platform/win/CursorWin.cpp

@@ -34 +34 @@
 
 #include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 #include <windows.h>
@@ -52 +53 @@
     HDC workingDC = CreateCompatibleDC(dc);
     if (doAlpha) {
-        OwnPtr<HBITMAP> hCursor(CreateDIBSection(dc, (BITMAPINFO *)&cursorImage, DIB_RGB_COLORS, 0, 0, 0));
+        OwnPtr<HBITMAP> hCursor = adoptPtr(CreateDIBSection(dc, (BITMAPINFO *)&cursorImage, DIB_RGB_COLORS, 0, 0, 0));
         ASSERT(hCursor);
 
@@ -62 +63 @@
         Vector<unsigned char, 128> maskBits;
         maskBits.fill(0xff, (img->width() + 7) / 8 * img->height());
-        OwnPtr<HBITMAP> hMask(CreateBitmap(img->width(), img->height(), 1, 1, maskBits.data()));
+        OwnPtr<HBITMAP> hMask = adoptPtr(CreateBitmap(img->width(), img->height(), 1, 1, maskBits.data()));
 
         ICONINFO ii;
@@ -77 +78 @@
         HDC andMaskDC = CreateCompatibleDC(dc);
         HDC xorMaskDC = CreateCompatibleDC(dc);
-        OwnPtr<HBITMAP> hCursor(CreateDIBSection(dc, &cursorImage, DIB_RGB_COLORS, 0, 0, 0));
+        OwnPtr<HBITMAP> hCursor = adoptPtr(CreateDIBSection(dc, &cursorImage, DIB_RGB_COLORS, 0, 0, 0));
         ASSERT(hCursor);
         img->getHBITMAP(hCursor.get()); 
         BITMAP cursor;
         GetObject(hCursor.get(), sizeof(BITMAP), &cursor);
-        OwnPtr<HBITMAP> andMask(CreateBitmap(cursor.bmWidth, cursor.bmHeight, 1, 1, NULL));
-        OwnPtr<HBITMAP> xorMask(CreateCompatibleBitmap(dc, cursor.bmWidth, cursor.bmHeight));
+        OwnPtr<HBITMAP> andMask = adoptPtr(CreateBitmap(cursor.bmWidth, cursor.bmHeight, 1, 1, NULL));
+        OwnPtr<HBITMAP> xorMask = adoptPtr(CreateCompatibleBitmap(dc, cursor.bmWidth, cursor.bmHeight));
         HBITMAP oldCursor = (HBITMAP)SelectObject(workingDC, hCursor.get());
         HBITMAP oldAndMask = (HBITMAP)SelectObject(andMaskDC, andMask.get());

trunk/Source/WebCore/platform/win/PasteboardWin.cpp

@@ -222 +222 @@
     HDC compatibleDC = CreateCompatibleDC(0);
     HDC sourceDC = CreateCompatibleDC(0);
-    OwnPtr<HBITMAP> resultBitmap(CreateCompatibleBitmap(dc, image->width(), image->height()));
+    OwnPtr<HBITMAP> resultBitmap = adoptPtr(CreateCompatibleBitmap(dc, image->width(), image->height()));
     HGDIOBJ oldBitmap = SelectObject(compatibleDC, resultBitmap.get());
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-05-01  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Fix OwnPtr strict issues in windows build
+        https://bugs.webkit.org/show_bug.cgi?id=59878
+
+        * FullscreenVideoController.cpp:
+        (FullscreenVideoController::FullscreenVideoController):
+        (FullscreenVideoController::createHUDWindow):
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::highlight):
+        * WebElementPropertyBag.cpp:
+        (WebElementPropertyBag::WebElementPropertyBag):
+        * WebNodeHighlight.cpp:
+        (WebNodeHighlight::update):
+        * WebNotificationCenter.cpp:
+        (WebNotificationCenter::WebNotificationCenter):
+        * WebView.cpp:
+        (WebView::close):
+        (WebView::paint):
+        (WebView::handleMouseEvent):
+        (WebView::registerEmbeddedViewMIMEType):
+
 2011-04-29  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/win/FullscreenVideoController.cpp

@@ -243 +243 @@
     , m_timer(this, &FullscreenVideoController::timerFired)
 #if USE(ACCELERATED_COMPOSITING)
-    , m_layerClient(new LayerClient(this))
+    , m_layerClient(adoptPtr(new LayerClient(this)))
     , m_rootChild(PlatformCALayer::create(PlatformCALayer::LayerTypeLayer, m_layerClient.get()))
 #endif
-    , m_fullscreenWindow(new MediaPlayerPrivateFullscreenWindow(this))
+    , m_fullscreenWindow(adoptPtr(new MediaPlayerPrivateFullscreenWindow(this)))
 {
 }
@@ -438 +438 @@
     void* pixels;
     BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(IntSize(windowWidth, windowHeight));
-    m_bitmap.set(::CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
-    
+    m_bitmap = adoptPtr(::CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
+
     // Dirty the window so the HUD draws
     RECT clearRect = { m_hudPosition.x(), m_hudPosition.y(), m_hudPosition.x() + windowWidth, m_hudPosition.y() + windowHeight };

trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp

@@ -182 +182 @@
 
     if (creatingHighlight)
-        m_highlight.set(new WebNodeHighlight(m_inspectedWebView));
+        m_highlight = adoptPtr(new WebNodeHighlight(m_inspectedWebView));
 
     if (m_highlight->isShowing())

trunk/Source/WebKit/win/WebElementPropertyBag.cpp

@@ -43 +43 @@
 // WebElementPropertyBag -----------------------------------------------
 WebElementPropertyBag::WebElementPropertyBag(const HitTestResult& result)
-    : m_result(new HitTestResult(result))
+    : m_result(adoptPtr(new HitTestResult(result)))
     , m_refCount(0)
 {

trunk/Source/WebKit/win/WebNodeHighlight.cpp

@@ -149 +149 @@
 
     void* pixels = 0;
-    OwnPtr<HBITMAP> hbmp(::CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
+    OwnPtr<HBITMAP> hbmp = adoptPtr(::CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
 
     ::SelectObject(hdc, hbmp.get());

trunk/Source/WebKit/win/WebNotificationCenter.cpp

@@ -33 +33 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
@@ -55 +56 @@
 WebNotificationCenter::WebNotificationCenter()
     : m_refCount(0)
-    , d(new WebNotificationCenterPrivate)
+    , d(adoptPtr(new WebNotificationCenterPrivate))
 {
     gClassCount++;

trunk/Source/WebKit/win/WebView.cpp

@@ -681 +681 @@
         m_mouseOutTracker->dwFlags = TME_CANCEL;
         ::TrackMouseEvent(m_mouseOutTracker.get());
-        m_mouseOutTracker.set(0);
+        m_mouseOutTracker.clear();
     }
     
@@ -1051 +1051 @@
     WindowsToPaint windowsToPaint;
     if (!dc) {
-        region.set(CreateRectRgn(0,0,0,0));
+        region = adoptPtr(CreateRectRgn(0,0,0,0));
         regionType = GetUpdateRgn(m_viewWindow, region.get(), false);
         hdc = BeginPaint(m_viewWindow, &ps);
@@ -1500 +1500 @@
         // Once WM_MOUSELEAVE is fired windows clears this tracker
         // so there is no need to disable it ourselves.
-        m_mouseOutTracker.set(0);
+        m_mouseOutTracker.clear();
         m_page->mainFrame()->eventHandler()->mouseMoved(mouseEvent);
         handled = true;
@@ -1509 +1509 @@
         handled = m_page->mainFrame()->eventHandler()->mouseMoved(mouseEvent);
         if (!m_mouseOutTracker) {
-            m_mouseOutTracker.set(new TRACKMOUSEEVENT);
+            m_mouseOutTracker = adoptPtr(new TRACKMOUSEEVENT);
             m_mouseOutTracker->cbSize = sizeof(TRACKMOUSEEVENT);
             m_mouseOutTracker->dwFlags = TME_LEAVE;
@@ -6027 +6027 @@
 
     if (!m_embeddedViewMIMETypes)
-        m_embeddedViewMIMETypes.set(new HashSet<String>);
+        m_embeddedViewMIMETypes = adoptPtr(new HashSet<String>);
 
     m_embeddedViewMIMETypes->add(String(mimeType, ::SysStringLen(mimeType)));