Changeset 84893 in webkit

Timestamp:

Apr 26, 2011 12:43:22 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-26 Adam Barth <​abarth@webkit.org>

Reviewed by David Levin.

WebKit/chromium should play nice with strict OwnPtrs
​https://bugs.webkit.org/show_bug.cgi?id=59434

This fixes about half the issues.

• src/ApplicationCacheHost.cpp: (WebCore::ApplicationCacheHost::maybeLoadMainResource):
• src/ApplicationCacheHostInternal.h: (WebCore::ApplicationCacheHostInternal::ApplicationCacheHostInternal):
• src/AutoFillPopupMenuClient.cpp: (WebKit::AutoFillPopupMenuClient::initialize):
• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DInternal::initialize):
• src/ResourceHandle.cpp: (WebCore::ResourceHandleInternal::start): (WebCore::ResourceHandle::ResourceHandle): (WebCore::ResourceHandle::loadResourceSynchronously):
• src/SocketStreamHandle.cpp: (WebCore::SocketStreamHandleInternal::connect):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ApplicationCacheHost.cpp (modified) (1 diff)
• src/ApplicationCacheHostInternal.h (modified) (1 diff)
• src/AutoFillPopupMenuClient.cpp (modified) (2 diffs)
• src/GraphicsContext3DChromium.cpp (modified) (2 diffs)
• src/ResourceHandle.cpp (modified) (3 diffs)
• src/SocketStreamHandle.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by David Levin.
+
+        WebKit/chromium should play nice with strict OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=59434
+
+        This fixes about half the issues.
+
+        * src/ApplicationCacheHost.cpp:
+        (WebCore::ApplicationCacheHost::maybeLoadMainResource):
+        * src/ApplicationCacheHostInternal.h:
+        (WebCore::ApplicationCacheHostInternal::ApplicationCacheHostInternal):
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::initialize):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::initialize):
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandleInternal::start):
+        (WebCore::ResourceHandle::ResourceHandle):
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+        * src/SocketStreamHandle.cpp:
+        (WebCore::SocketStreamHandleInternal::connect):
+
 2011-04-25  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebKit/chromium/src/ApplicationCacheHost.cpp

@@ -80 +80 @@
         return;
 
-    m_internal.set(new ApplicationCacheHostInternal(this));
+    m_internal = adoptPtr(new ApplicationCacheHostInternal(this));
     if (m_internal->m_outerHost) {
         WrappedResourceRequest wrapped(request);

trunk/Source/WebKit/chromium/src/ApplicationCacheHostInternal.h

@@ -51 +51 @@
         WebKit::WebFrameImpl* webFrame = WebKit::WebFrameImpl::fromFrame(host->m_documentLoader->frame());
         ASSERT(webFrame);
-        m_outerHost.set(webFrame->client()->createApplicationCacheHost(webFrame, this));
+        m_outerHost = adoptPtr(webFrame->client()->createApplicationCacheHost(webFrame, this));
     }
 

trunk/Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -292 +292 @@
     // The direction of text in popup menu is set the same as the direction of
     // the input element: textField.
-    m_regularStyle.set(new PopupMenuStyle(Color::black,
-                                          Color::white,
-                                          regularFont,
-                                          true,
-                                          false,
-                                          Length(WebCore::Fixed),
-                                          textField->renderer()->style()->direction(),
-                                          textField->renderer()->style()->unicodeBidi() == Override,
-                                          PopupMenuStyle::AutofillPopup));
+    m_regularStyle = adoptPtr(new PopupMenuStyle(Color::black, Color::white, regularFont, true, false,
+                                                 Length(WebCore::Fixed), textField->renderer()->style()->direction(),
+                                                 textField->renderer()->style()->unicodeBidi() == Override,
+                                                 PopupMenuStyle::AutofillPopup));
 
     FontDescription warningFontDescription = regularFont.fontDescription();
@@ -306 +301 @@
     Font warningFont(warningFontDescription, regularFont.letterSpacing(), regularFont.wordSpacing());
     warningFont.update(regularFont.fontSelector());
-    m_warningStyle.set(new PopupMenuStyle(Color::darkGray,
-                                          m_regularStyle->backgroundColor(),
-                                          warningFont,
-                                          m_regularStyle->isVisible(),
-                                          m_regularStyle->isDisplayNone(),
-                                          m_regularStyle->textIndent(),
-                                          m_regularStyle->textDirection(),
-                                          m_regularStyle->hasTextDirectionOverride(),
-                                          PopupMenuStyle::AutofillPopup));
+    m_warningStyle = adoptPtr(new PopupMenuStyle(Color::darkGray, m_regularStyle->backgroundColor(), warningFont,
+                                                 m_regularStyle->isVisible(), m_regularStyle->isDisplayNone(),
+                                                 m_regularStyle->textIndent(), m_regularStyle->textDirection(),
+                                                 m_regularStyle->hasTextDirectionOverride(),
+                                                 PopupMenuStyle::AutofillPopup));
 }
 

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -110 +110 @@
     webAttributes.premultipliedAlpha = attrs.premultipliedAlpha;
     webAttributes.canRecoverFromContextLoss = attrs.canRecoverFromContextLoss;
-    WebKit::WebGraphicsContext3D* webContext = WebKit::webKitClient()->createGraphicsContext3D();
+    OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::webKitClient()->createGraphicsContext3D());
     if (!webContext)
         return false;
@@ -121 +121 @@
     if (!m_webViewImpl)
         return false;
-    if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow)) {
-        delete webContext;
+    if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow))
         return false;
-    }
-    m_impl.set(webContext);
+    m_impl = webContext;
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Source/WebKit/chromium/src/ResourceHandle.cpp

@@ -105 +105 @@
     m_state = ConnectionStateStarted;
 
-    m_loader.set(webKitClient()->createURLLoader());
+    m_loader = adoptPtr(webKitClient()->createURLLoader());
     ASSERT(m_loader.get());
 
@@ -202 +202 @@
                                bool defersLoading,
                                bool shouldContentSniff)
-    : d(new ResourceHandleInternal(request, client))
+    : d(adoptPtr(new ResourceHandleInternal(request, client)))
 {
     d->m_owner = this;
@@ -293 +293 @@
                                                Vector<char>& data)
 {
-    OwnPtr<WebURLLoader> loader(webKitClient()->createURLLoader());
+    OwnPtr<WebURLLoader> loader = adoptPtr(webKitClient()->createURLLoader());
     ASSERT(loader.get());
 

trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp

@@ -90 +90 @@
 void SocketStreamHandleInternal::connect(const KURL& url)
 {
-    m_socket.set(webKitClient()->createSocketStreamHandle());
+    m_socket = adoptPtr(webKitClient()->createSocketStreamHandle());
     LOG(Network, "connect");
     ASSERT(m_socket.get());