From 6f7f240b12091a6aa7305952771cc8a32d8e3a47 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Wed, 16 Nov 2011 16:09:46 -0800 Subject: Audit misuse of PassRefPtr Reviewed Android code for misuse of PassRefPtr in place of RefPtr. Also reviewed for PassOwnPtr and found no apparent misuse. Bug: 5631569 Change-Id: Ib22b340875b1d875091af47cef6510d9c63e351b --- .../android/WebCoreSupport/autofill/FormManagerAndroid.cpp | 2 +- Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 10 +++++----- Source/WebKit/android/jni/WebViewCore.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Source/WebKit') diff --git a/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp index e837244..2969252 100644 --- a/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp @@ -562,7 +562,7 @@ void FormManager::ExtractForms(Frame* frame) { ResetFrame(frame); - WTF::PassRefPtr web_forms = frame->document()->forms(); + WTF::RefPtr web_forms = frame->document()->forms(); for (size_t i = 0; i < web_forms->length(); ++i) { // Owned by |form_elements|. diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index ed2a326..37e946d 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -500,7 +500,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, if (checkException(env)) return 0; - PassRefPtr h; + RefPtr h; if (jLoadListener) h = WebCoreResourceLoader::create(env, jLoadListener); env->DeleteLocalRef(jLoadListener); @@ -1174,7 +1174,7 @@ void WebFrame::maybeSavePassword(WebCore::Frame* frame, const WebCore::ResourceR bool WebFrame::getUsernamePasswordFromDom(WebCore::Frame* frame, WTF::String& username, WTF::String& password) { bool found = false; - WTF::PassRefPtr form = frame->document()->forms(); + WTF::RefPtr form = frame->document()->forms(); WebCore::Node* node = form->firstItem(); while (node && !found && !node->namespaceURI().isNull() && !node->namespaceURI().isEmpty()) { @@ -1510,7 +1510,7 @@ static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data, // Setup the substituteData const char* dataStr = env->GetStringUTFChars(data, NULL); - WTF::PassRefPtr sharedBuffer = + WTF::RefPtr sharedBuffer = WebCore::SharedBuffer::create(); LOG_ASSERT(dataStr, "nativeLoadData has a null data string."); sharedBuffer->append(dataStr, strlen(dataStr)); @@ -1978,7 +1978,7 @@ static jboolean HasPasswordField(JNIEnv *env, jobject obj) LOG_ASSERT(pFrame, "HasPasswordField must take a valid frame pointer!"); bool found = false; - WTF::PassRefPtr form = pFrame->document()->forms(); + WTF::RefPtr form = pFrame->document()->forms(); WebCore::Node* node = form->firstItem(); // Null/Empty namespace means that node is not created in HTMLFormElement // class, but just normal Element class. @@ -2031,7 +2031,7 @@ static void SetUsernamePassword(JNIEnv *env, jobject obj, WebCore::HTMLInputElement* usernameEle = NULL; WebCore::HTMLInputElement* passwordEle = NULL; bool found = false; - WTF::PassRefPtr form = pFrame->document()->forms(); + WTF::RefPtr form = pFrame->document()->forms(); WebCore::Node* node = form->firstItem(); while (node && !found && !node->namespaceURI().isNull() && !node->namespaceURI().isEmpty()) { diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index eb2e3cc..70ecec9 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -2233,7 +2233,7 @@ String WebViewCore::modifySelectionTextNavigationAxis(DOMSelection* selection, i if (m_currentNodeDomNavigationAxis && CacheBuilder::validNode(m_mainFrame, m_mainFrame, m_currentNodeDomNavigationAxis)) { - PassRefPtr rangeRef = + RefPtr rangeRef = selection->frame()->document()->createRange(); rangeRef->selectNode(m_currentNodeDomNavigationAxis, ec); m_currentNodeDomNavigationAxis = 0; @@ -2245,7 +2245,7 @@ String WebViewCore::modifySelectionTextNavigationAxis(DOMSelection* selection, i } else if (m_cursorNode && CacheBuilder::validNode(m_mainFrame, m_mainFrame, m_cursorNode)) { - PassRefPtr rangeRef = + RefPtr rangeRef = selection->frame()->document()->createRange(); rangeRef->selectNode(reinterpret_cast(m_cursorNode), ec); if (ec) @@ -2449,7 +2449,7 @@ String WebViewCore::modifySelectionTextNavigationAxis(DOMSelection* selection, i scrollNodeIntoView(m_mainFrame, selection->anchorNode()); // format markup for the visible content - PassRefPtr range = selection->getRangeAt(0, ec); + RefPtr range = selection->getRangeAt(0, ec); if (ec) return String(); IntRect bounds = range->boundingBox(); @@ -2776,7 +2776,7 @@ String WebViewCore::formatMarkup(DOMSelection* selection) { ExceptionCode ec = 0; String markup = String(); - PassRefPtr wholeRange = selection->getRangeAt(0, ec); + RefPtr wholeRange = selection->getRangeAt(0, ec); if (ec) return String(); if (!wholeRange->startContainer() || !wholeRange->startContainer()) @@ -2786,7 +2786,7 @@ String WebViewCore::formatMarkup(DOMSelection* selection) Node* firstNode = wholeRange->firstNode(); Node* pastLastNode = wholeRange->pastLastNode(); Node* currentNode = firstNode; - PassRefPtr currentRange; + RefPtr currentRange; while (currentNode != pastLastNode) { Node* nextNode = currentNode->traverseNextNode(); -- cgit v1.1