Changeset 187010 in webkit
- Timestamp:
- Jul 19, 2015 6:16:54 AM (9 years ago)
- Location:
- trunk/Source/WebKit/win
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/win/ChangeLog
r187002 r187010 1 2015-07-19 David Kilzer <ddkilzer@apple.com> 2 3 REGRESSION (r187002): Broke the Windows build: Reduce PassRefPtr in WebKit2 - 3 4 <https://bugs.webkit.org/show_bug.cgi?id=146995> 5 6 Attempt to fix the Windows build. 7 8 * WebCoreSupport/WebFrameLoaderClient.cpp: 9 (WebFrameLoaderClient::createDocumentLoader): 10 (WebFrameLoaderClient::createFrame): 11 (WebFrameLoaderClient::createPlugin): 12 * WebCoreSupport/WebFrameLoaderClient.h: 13 * WebDocumentLoader.cpp: 14 (WebDocumentLoader::create): 15 * WebDocumentLoader.h: 16 1 17 2015-07-18 Gyuyoung Kim <gyuyoung.kim@webkit.org> 2 18 -
trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
r187002 r187010 954 954 Ref<WebDocumentLoader> loader = WebDocumentLoader::create(request, substituteData); 955 955 956 COMPtr<WebDataSource> dataSource(AdoptCOM, WebDataSource::createInstance(loader. get()));956 COMPtr<WebDataSource> dataSource(AdoptCOM, WebDataSource::createInstance(loader.ptr())); 957 957 958 958 loader->setDataSource(dataSource.get()); … … 1047 1047 } 1048 1048 1049 PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,1049 RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement, 1050 1050 const String& referrer, bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/) 1051 1051 { 1052 1052 RefPtr<Frame> result = createFrame(url, name, ownerElement, referrer); 1053 1053 if (!result) 1054 return 0;1055 return result .release();1056 } 1057 1058 PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)1054 return nullptr; 1055 return result; 1056 } 1057 1058 RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer) 1059 1059 { 1060 1060 Frame* coreFrame = core(m_webFrame); … … 1073 1073 // The frame's onload handler may have removed it from the document. 1074 1074 if (!childFrame->tree().parent()) 1075 return 0;1076 1077 return childFrame .release();1075 return nullptr; 1076 1077 return childFrame; 1078 1078 } 1079 1079 … … 1165 1165 } 1166 1166 1167 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)1167 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) 1168 1168 { 1169 1169 WebView* webView = m_webFrame->webView(); … … 1210 1210 dispatchDidFailToStartPlugin(pluginView.get()); 1211 1211 1212 return 0;1212 return nullptr; 1213 1213 } 1214 1214 -
trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
r187002 r187010 208 208 209 209 private: 210 PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer);210 RefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, const WTF::String& referrer); 211 211 WebHistory* webHistory() const; 212 212 -
trunk/Source/WebKit/win/WebDocumentLoader.cpp
r176892 r187010 39 39 } 40 40 41 PassRefPtr<WebDocumentLoader> WebDocumentLoader::create(const ResourceRequest& req, const SubstituteData& data)41 Ref<WebDocumentLoader> WebDocumentLoader::create(const ResourceRequest& request, const SubstituteData& data) 42 42 { 43 return adoptRef( new WebDocumentLoader(req, data));43 return adoptRef(*new WebDocumentLoader(request, data)); 44 44 } 45 45 -
trunk/Source/WebKit/win/WebDocumentLoader.h
r165676 r187010 32 32 { 33 33 public: 34 static PassRefPtr<WebDocumentLoader> create(const ResourceRequest&, const SubstituteData&);34 static Ref<WebDocumentLoader> create(const ResourceRequest&, const SubstituteData&); 35 35 36 36 ~WebDocumentLoader();
Note: See TracChangeset
for help on using the changeset viewer.