Changeset 187010 in webkit

Timestamp:

Jul 19, 2015 6:16:54 AM (9 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r187002): Broke the Windows build: Reduce PassRefPtr in WebKit2 - 3
<​https://bugs.webkit.org/show_bug.cgi?id=146995>

Attempt to fix the Windows build.

• WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::createDocumentLoader):
(WebFrameLoaderClient::createFrame):
(WebFrameLoaderClient::createPlugin):

• WebCoreSupport/WebFrameLoaderClient.h:
• WebDocumentLoader.cpp:

(WebDocumentLoader::create):

• WebDocumentLoader.h:

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.cpp (modified) (5 diffs)
• WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebDocumentLoader.cpp (modified) (1 diff)
• WebDocumentLoader.h (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-07-19  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r187002): Broke the Windows build: Reduce PassRefPtr in WebKit2 - 3
+        <https://bugs.webkit.org/show_bug.cgi?id=146995>
+
+        Attempt to fix the Windows build.
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::createDocumentLoader):
+        (WebFrameLoaderClient::createFrame):
+        (WebFrameLoaderClient::createPlugin):
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebDocumentLoader.cpp:
+        (WebDocumentLoader::create):
+        * WebDocumentLoader.h:
+
 2015-07-18  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

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

@@ -954 +954 @@
     Ref<WebDocumentLoader> loader = WebDocumentLoader::create(request, substituteData);
 
-    COMPtr<WebDataSource> dataSource(AdoptCOM, WebDataSource::createInstance(loader.get()));
+    COMPtr<WebDataSource> dataSource(AdoptCOM, WebDataSource::createInstance(loader.ptr()));
 
     loader->setDataSource(dataSource.get());
@@ -1047 +1047 @@
 }
 
-PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
+RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                             const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
 {
     RefPtr<Frame> result = createFrame(url, name, ownerElement, referrer);
     if (!result)
-        return 0;
-    return result.release();
-}
-
-PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)
+        return nullptr;
+    return result;
+}
+
+RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)
 {
     Frame* coreFrame = core(m_webFrame);
@@ -1073 +1073 @@
     // The frame's onload handler may have removed it from the document.
     if (!childFrame->tree().parent())
-        return 0;
-
-    return childFrame.release();
+        return nullptr;
+
+    return childFrame;
 }
 
@@ -1165 +1165 @@
 }
 
-PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& pluginSize, HTMLPlugInElement* element, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
+RefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& pluginSize, HTMLPlugInElement* element, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
     WebView* webView = m_webFrame->webView();
@@ -1210 +1210 @@
     dispatchDidFailToStartPlugin(pluginView.get());
 
-    return 0;
+    return nullptr;
 }
 

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h

@@ -208 +208 @@
 
 private:
-    PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);
+    RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);
     WebHistory* webHistory() const;
 

trunk/Source/WebKit/win/WebDocumentLoader.cpp

@@ -39 +39 @@
 }
 
-PassRefPtr<WebDocumentLoader> WebDocumentLoader::create(const ResourceRequest& req, const SubstituteData& data)
+Ref<WebDocumentLoader> WebDocumentLoader::create(const ResourceRequest& request, const SubstituteData& data)
 {
-    return adoptRef(new WebDocumentLoader(req, data));
+    return adoptRef(*new WebDocumentLoader(request, data));
 }
 

trunk/Source/WebKit/win/WebDocumentLoader.h

@@ -32 +32 @@
 {
 public:
-    static PassRefPtr<WebDocumentLoader> create(const ResourceRequest&, const SubstituteData&);
+    static Ref<WebDocumentLoader> create(const ResourceRequest&, const SubstituteData&);
 
     ~WebDocumentLoader();