Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Libraries
Commits
d9519130
Commit
d9519130
authored
Oct 22, 2014
by
Andrea Iacovitti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix url comparison.
parent
351f7ab9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
khtml/rendering/render_image.cpp
khtml/rendering/render_image.cpp
+11
-6
No files found.
khtml/rendering/render_image.cpp
View file @
d9519130
...
...
@@ -430,12 +430,17 @@ void RenderImage::updateFromElement()
DOMString
u
=
element
()
->
id
()
==
ID_OBJECT
?
element
()
->
getAttribute
(
ATTR_DATA
)
:
element
()
->
getAttribute
(
ATTR_SRC
);
if
(
!
u
.
isEmpty
()
&&
(
!
m_cachedImage
||
m_cachedImage
->
url
()
!=
u
)
)
{
CachedImage
*
new_image
=
element
()
->
document
()
->
docLoader
()
->
requestImage
(
u
);
if
(
new_image
&&
new_image
!=
m_cachedImage
)
updateImage
(
new_image
);
if
(
!
u
.
isEmpty
())
{
// Need to compute completeURL, as 'u' can be relative
// while m_cachedImage->url() is always full url
DocumentImpl
*
docImpl
=
element
()
->
document
();
const
QString
fullUrl
=
docImpl
->
completeURL
(
u
.
string
());
if
(
!
m_cachedImage
||
m_cachedImage
->
url
()
!=
fullUrl
)
{
CachedImage
*
new_image
=
docImpl
->
docLoader
()
->
requestImage
(
fullUrl
);
if
(
new_image
&&
new_image
!=
m_cachedImage
)
{
updateImage
(
new_image
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment