summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/public/WebURLRequest.h
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2010-11-10 15:31:59 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2010-11-17 13:35:59 -0800
commit28040489d744e0c5d475a88663056c9040ed5320 (patch)
treec463676791e4a63e452a95f0a12b2a8519730693 /WebKit/chromium/public/WebURLRequest.h
parenteff9be92c41913c92fb1d3b7983c071f3e718678 (diff)
downloadexternal_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip
external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz
external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'WebKit/chromium/public/WebURLRequest.h')
-rw-r--r--WebKit/chromium/public/WebURLRequest.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/WebKit/chromium/public/WebURLRequest.h b/WebKit/chromium/public/WebURLRequest.h
index e64ce80..c800452 100644
--- a/WebKit/chromium/public/WebURLRequest.h
+++ b/WebKit/chromium/public/WebURLRequest.h
@@ -58,9 +58,7 @@ public:
enum TargetType {
TargetIsMainFrame = 0,
- TargetIsSubFrame = 1, // Temporary for backward compatibility.
TargetIsSubframe = 1,
- TargetIsSubResource = 2, // Temporary for backward comptibility.
TargetIsSubresource = 2,
TargetIsStyleSheet = 3,
TargetIsScript = 4,