Issue 123003002: Make calls to AtomicString(const String&) explicit in loader/ and fetch/

Issue 123003002: Make calls to AtomicString(const String&) explicit in loader/ and fetch/ (Closed)

Created:
6 years, 11 months ago by Inactive

Modified:
6 years, 11 months ago

Reviewers:
eseidel

CC:
blink-reviews, Nate Chapin, gavinp+loader_chromium.org, abarth-chromium

Base URL:
https://chromium.googlesource.com/chromium/blink.git@master

Visibility:
Public.

More Reviews

Description

Make calls to AtomicString(const String&) explicit in loader/ and fetch/ Make calls to AtomicString(const String&) explicit in load/ and fetch/, and avoid useless conversions from String to AtomicString when possible. This is one step towards making the AtomicString(const String&) constructor explicit. This CL takes care only of the loader/ & fetch/ part so that it is more easily reviewable. R=eseidel BUG=323739 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=164426

Patch Set 1 #

Total comments: 10

Patch Set 2 : Take feedback into consideration #

Patch Set 3 : Rebase #

Created: 6 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+77 lines, -51 lines)			Patch
M	Source/core/fetch/CrossOriginAccessControl.cpp	View	1	3 chunks	+3 lines, -3 lines	0 comments	Download
M	Source/core/fetch/ImageResourceTest.cpp	View		2 chunks	+2 lines, -2 lines	0 comments	Download
M	Source/core/fetch/ScriptResource.cpp	View		1 chunk	+1 line, -1 line	0 comments	Download
M	Source/core/loader/DocumentThreadableLoader.cpp	View	1	1 chunk	+1 line, -1 line	0 comments	Download
M	Source/core/loader/FormSubmission.h	View	1 2	6 chunks	+7 lines, -7 lines	0 comments	Download
M	Source/core/loader/FormSubmission.cpp	View	1 2	5 chunks	+9 lines, -9 lines	0 comments	Download
M	Source/core/loader/FrameFetchContext.cpp	View		1 chunk	+2 lines, -2 lines	0 comments	Download
M	Source/core/loader/FrameLoader.cpp	View	1	5 chunks	+6 lines, -6 lines	0 comments	Download
M	Source/core/loader/NavigationScheduler.cpp	View	1	6 chunks	+9 lines, -9 lines	0 comments	Download
M	Source/core/loader/PingLoader.cpp	View		1 chunk	+2 lines, -2 lines	0 comments	Download
M	Source/core/loader/WorkerThreadableLoader.cpp	View		1 chunk	+1 line, -1 line	0 comments	Download
M	Source/platform/weborigin/SecurityOrigin.h	View	1	2 chunks	+3 lines, -0 lines	0 comments	Download
M	Source/platform/weborigin/SecurityOrigin.cpp	View	1	1 chunk	+31 lines, -8 lines	0 comments	Download

Messages

Total messages: 8 (0 generated)

Expand Messages | Collapse Messages

eseidel

https://codereview.chromium.org/123003002/diff/1/Source/core/fetch/CrossOriginAccessControl.cpp File Source/core/fetch/CrossOriginAccessControl.cpp (right): https://codereview.chromium.org/123003002/diff/1/Source/core/fetch/CrossOriginAccessControl.cpp#newcode130 Source/core/fetch/CrossOriginAccessControl.cpp:130: preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", headerBuffer.toAtomicString().lower()); Wrong order. No sense in making an ...

6 years, 11 months ago (2013-12-31 22:05:03 UTC) #2

Inactive

6 years, 11 months ago (2013-12-31 22:47:25 UTC) #3

eseidel

lgtm. CCing abarth to see the security origin changes and KURL usage go by.

6 years, 11 months ago (2013-12-31 23:22:49 UTC) #4

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/123003002/90002

6 years, 11 months ago (2014-01-02 19:34:59 UTC) #5

commit-bot: I haz the power

Failed to apply patch for Source/core/loader/FormSubmission.cpp: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years, 11 months ago (2014-01-02 19:35:04 UTC) #6

Failed to apply patch for Source/core/loader/FormSubmission.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/loader/FormSubmission.cpp
  Hunk #2 FAILED at 140.
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/loader/FormSubmission.cpp.rej

Patch:       Source/core/loader/FormSubmission.cpp
Index: Source/core/loader/FormSubmission.cpp
diff --git a/Source/core/loader/FormSubmission.cpp
b/Source/core/loader/FormSubmission.cpp
index
178a996bc763acb3abfd5f022db45241dbde6af4..ff0440a25bd8e7db0a3b0131334ab04595bf96fc
100644
--- a/Source/core/loader/FormSubmission.cpp
+++ b/Source/core/loader/FormSubmission.cpp
@@ -86,13 +86,13 @@ void FormSubmission::Attributes::parseAction(const String&
action)
     m_action = stripLeadingAndTrailingHTMLSpaces(action);
 }
 
-String FormSubmission::Attributes::parseEncodingType(const String& type)
+AtomicString FormSubmission::Attributes::parseEncodingType(const String& type)
 {
     if (equalIgnoringCase(type, "multipart/form-data"))
-        return "multipart/form-data";
+        return AtomicString("multipart/form-data",
AtomicString::ConstructFromLiteral);
     if (equalIgnoringCase(type, "text/plain"))
-        return "text/plain";
-    return "application/x-www-form-urlencoded";
+        return AtomicString("text/plain", AtomicString::ConstructFromLiteral);
+    return AtomicString("application/x-www-form-urlencoded",
AtomicString::ConstructFromLiteral);
 }
 
 void FormSubmission::Attributes::updateEncodingType(const String& type)
@@ -140,7 +140,7 @@ void FormSubmission::Attributes::copyFrom(const Attributes&
other)
     m_acceptCharset = other.m_acceptCharset;
 }
 
-inline FormSubmission::FormSubmission(Method method, const KURL& action, const
String& target, const String& contentType, PassRefPtr<FormState> state,
PassRefPtr<FormData> data, const String& boundary, PassRefPtr<Event> event)
+inline FormSubmission::FormSubmission(Method method, const KURL& action, const
String& target, const AtomicString& contentType, PassRefPtr<FormState> state,
PassRefPtr<FormData> data, const String& boundary, PassRefPtr<Event> event)
     : m_method(method)
     , m_action(action)
     , m_target(target)
@@ -193,12 +193,12 @@ PassRefPtr<FormSubmission>
FormSubmission::create(HTMLFormElement* form, const A
     KURL actionURL = document.completeURL(copiedAttributes.action().isEmpty() ?
document.url().string() : copiedAttributes.action());
     bool isMailtoForm = actionURL.protocolIs("mailto");
     bool isMultiPartForm = false;
-    String encodingType = copiedAttributes.encodingType();
+    AtomicString encodingType = copiedAttributes.encodingType();
 
     if (copiedAttributes.method() == PostMethod) {
         isMultiPartForm = copiedAttributes.isMultiPartForm();
         if (isMultiPartForm && isMailtoForm) {
-            encodingType = "application/x-www-form-urlencoded";
+            encodingType = AtomicString("application/x-www-form-urlencoded",
AtomicString::ConstructFromLiteral);
             isMultiPartForm = false;
         }
     }
@@ -259,7 +259,7 @@ void
FormSubmission::populateFrameLoadRequest(FrameLoadRequest& frameRequest)
         frameRequest.setFrameName(m_target);
 
     if (!m_referrer.isEmpty())
-        frameRequest.resourceRequest().setHTTPReferrer(m_referrer);
+       
frameRequest.resourceRequest().setHTTPReferrer(AtomicString(m_referrer));
 
     if (m_method == FormSubmission::PostMethod) {
         frameRequest.resourceRequest().setHTTPMethod("POST");
@@ -273,7 +273,7 @@ void
FormSubmission::populateFrameLoadRequest(FrameLoadRequest& frameRequest)
     }
 
     frameRequest.resourceRequest().setURL(requestURL());
-    FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(),
m_origin);
+    FrameLoader::addHTTPOriginIfNeeded(frameRequest.resourceRequest(),
AtomicString(m_origin));
 }
 
 }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/123003002/290001

6 years, 11 months ago (2014-01-02 20:10:57 UTC) #7

Message was sent while issue was closed.

Change committed as 164426

Expand Messages | Collapse Messages