WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-59434-20110426004132.patch (text/plain), 8.92 KB, created by
Adam Barth
on 2011-04-26 00:41:33 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Adam Barth
Created:
2011-04-26 00:41:33 PDT
Size:
8.92 KB
patch
obsolete
>Index: Source/WebKit/chromium/ChangeLog >=================================================================== >--- Source/WebKit/chromium/ChangeLog (revision 84892) >+++ Source/WebKit/chromium/ChangeLog (working copy) >@@ -1,3 +1,27 @@ >+2011-04-26 Adam Barth <abarth@webkit.org> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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> > > Unreviewed, build fix. >Index: Source/WebKit/chromium/src/ApplicationCacheHost.cpp >=================================================================== >--- Source/WebKit/chromium/src/ApplicationCacheHost.cpp (revision 84886) >+++ Source/WebKit/chromium/src/ApplicationCacheHost.cpp (working copy) >@@ -79,7 +79,7 @@ void ApplicationCacheHost::maybeLoadMain > if (!isApplicationCacheEnabled()) > return; > >- m_internal.set(new ApplicationCacheHostInternal(this)); >+ m_internal = adoptPtr(new ApplicationCacheHostInternal(this)); > if (m_internal->m_outerHost) { > WrappedResourceRequest wrapped(request); > m_internal->m_outerHost->willStartMainResourceRequest(wrapped, WebFrameImpl::fromFrame(m_documentLoader->frame())); >Index: Source/WebKit/chromium/src/ApplicationCacheHostInternal.h >=================================================================== >--- Source/WebKit/chromium/src/ApplicationCacheHostInternal.h (revision 84886) >+++ Source/WebKit/chromium/src/ApplicationCacheHostInternal.h (working copy) >@@ -50,7 +50,7 @@ public: > { > 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)); > } > > virtual void didChangeCacheAssociation() >Index: Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp >=================================================================== >--- Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp (revision 84886) >+++ Source/WebKit/chromium/src/AutoFillPopupMenuClient.cpp (working copy) >@@ -291,29 +291,20 @@ void AutoFillPopupMenuClient::initialize > regularFont.update(textField->document()->styleSelector()->fontSelector()); > // 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(); > warningFontDescription.setItalic(true); > 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)); > } > > void AutoFillPopupMenuClient::setSuggestions(const WebVector<WebString>& names, >Index: Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp >=================================================================== >--- Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (revision 84886) >+++ Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (working copy) >@@ -109,7 +109,7 @@ bool GraphicsContext3DInternal::initiali > webAttributes.antialias = attrs.antialias; > 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; > >@@ -120,11 +120,9 @@ bool GraphicsContext3DInternal::initiali > > 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) > m_compositingLayer = WebGLLayerChromium::create(0); >Index: Source/WebKit/chromium/src/ResourceHandle.cpp >=================================================================== >--- Source/WebKit/chromium/src/ResourceHandle.cpp (revision 84886) >+++ Source/WebKit/chromium/src/ResourceHandle.cpp (working copy) >@@ -104,7 +104,7 @@ void ResourceHandleInternal::start() > CRASH(); > m_state = ConnectionStateStarted; > >- m_loader.set(webKitClient()->createURLLoader()); >+ m_loader = adoptPtr(webKitClient()->createURLLoader()); > ASSERT(m_loader.get()); > > WrappedResourceRequest wrappedRequest(m_request); >@@ -201,7 +201,7 @@ ResourceHandle::ResourceHandle(const Res > ResourceHandleClient* client, > bool defersLoading, > bool shouldContentSniff) >- : d(new ResourceHandleInternal(request, client)) >+ : d(adoptPtr(new ResourceHandleInternal(request, client))) > { > d->m_owner = this; > >@@ -292,7 +292,7 @@ void ResourceHandle::loadResourceSynchro > ResourceResponse& response, > Vector<char>& data) > { >- OwnPtr<WebURLLoader> loader(webKitClient()->createURLLoader()); >+ OwnPtr<WebURLLoader> loader = adoptPtr(webKitClient()->createURLLoader()); > ASSERT(loader.get()); > > WrappedResourceRequest requestIn(request); >Index: Source/WebKit/chromium/src/SocketStreamHandle.cpp >=================================================================== >--- Source/WebKit/chromium/src/SocketStreamHandle.cpp (revision 84886) >+++ Source/WebKit/chromium/src/SocketStreamHandle.cpp (working copy) >@@ -89,7 +89,7 @@ SocketStreamHandleInternal::~SocketStrea > > void SocketStreamHandleInternal::connect(const KURL& url) > { >- m_socket.set(webKitClient()->createSocketStreamHandle()); >+ m_socket = adoptPtr(webKitClient()->createSocketStreamHandle()); > LOG(Network, "connect"); > ASSERT(m_socket.get()); > m_socket->connect(url, this);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
levin
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 59434
: 91078