OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8fde13
)
Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NET...
author
Steve Block
<steveblock@google.com>
Tue, 2 Feb 2010 18:25:42 +0000
(18:25 +0000)
committer
Steve Block
<steveblock@google.com>
Thu, 4 Feb 2010 15:06:58 +0000
(15:06 +0000)
See http://trac.webkit.org/changeset/52177
Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42
WebCore/loader/CachedImage.cpp
patch
|
blob
|
history
diff --git
a/WebCore/loader/CachedImage.cpp
b/WebCore/loader/CachedImage.cpp
index
1105f66
..
dd93041
100644
(file)
--- a/
WebCore/loader/CachedImage.cpp
+++ b/
WebCore/loader/CachedImage.cpp
@@
-85,12
+85,8
@@
void CachedImage::load(DocLoader* docLoader)
if (!docLoader || (docLoader->autoLoadImages() && !docLoader->shouldBlockNetworkImage(m_url)))
#else
if (!docLoader || docLoader->autoLoadImages())
-<<<<<<< HEAD
#endif
- CachedResource::load(docLoader, true, false, true);
-=======
CachedResource::load(docLoader, true, DoSecurityCheck, true);
->>>>>>> webkit.org at r54127
else
m_loading = false;
}