Source/core/html/LinkResource.cpp - Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/core/html/LinkResource.cpp

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebased again, passes tests Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/html/HTMLVideoElement.cpp ('k') | Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 , m_url(owner->getNonEmptyURLAttribute(hrefAttr))	66 , m_url(owner->getNonEmptyURLAttribute(hrefAttr))

67 {	67 {

68 m_charset = m_owner->getAttribute(charsetAttr);	68 m_charset = m_owner->getAttribute(charsetAttr);

69 if (m_charset.isEmpty() && m_owner->document().frame())	69 if (m_charset.isEmpty() && m_owner->document().frame())

70 m_charset = m_owner->document().charset();	70 m_charset = m_owner->document().charset();

71 }	71 }

72	72

73 FetchRequest LinkRequestBuilder::build(bool blocking) const	73 FetchRequest LinkRequestBuilder::build(bool blocking) const

74 {	74 {

75 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;	75 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;

76 return FetchRequest(ResourceRequest(m_owner->document().completeURL(m_url)), m_owner->localName(), m_charset, priority);	76 return FetchRequest(ResourceRequest(m_owner->treeScope().completeURL(m_url)) , m_owner->localName(), m_charset, priority);

77 }	77 }

78	78

79 } // namespace WebCore	79 } // namespace WebCore

OLD	NEW