OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge WebKit at r84325: Initial merge by git.
[android-x86/external-webkit.git]
/
Source
/
WebCore
/
loader
/
cache
/
CachedResourceLoader.h
diff --git
a/Source/WebCore/loader/cache/CachedResourceLoader.h
b/Source/WebCore/loader/cache/CachedResourceLoader.h
index
881ad2f
..
79c63b9
100644
(file)
--- a/
Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/
Source/WebCore/loader/cache/CachedResourceLoader.h
@@
-69,7
+69,7
@@
public:
CachedXSLStyleSheet* requestXSLStyleSheet(const String& url);
#endif
#if ENABLE(LINK_PREFETCH)
CachedXSLStyleSheet* requestXSLStyleSheet(const String& url);
#endif
#if ENABLE(LINK_PREFETCH)
- CachedResource* requestLink
Prefetch(const String &url
);
+ CachedResource* requestLink
Resource(const String &url, ResourceLoadPriority priority = ResourceLoadPriorityUnresolved
);
#endif
// Logs an access denied message to the console for the specified URL.
#endif
// Logs an access denied message to the console for the specified URL.