Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: Source/WebCore/page/SecurityOrigin.cpp

Issue 13497009: Remove ENABLE(FILE_SYSTEM) compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added CodeGeneratorInspector.py change Created 7 years, 8 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/WebCore/page/DOMWindow.idl ('k') | Source/WebCore/platform/AsyncFileSystem.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 return url.protocolIsInHTTPFamily() || url.protocolIs("ftp"); 53 return url.protocolIsInHTTPFamily() || url.protocolIs("ftp");
54 } 54 }
55 55
56 bool SecurityOrigin::shouldUseInnerURL(const KURL& url) 56 bool SecurityOrigin::shouldUseInnerURL(const KURL& url)
57 { 57 {
58 #if ENABLE(BLOB) 58 #if ENABLE(BLOB)
59 // FIXME: Blob URLs don't have inner URLs. Their form is "blob:<inner-origin >/<UUID>", so treating the part after "blob:" as a URL is incorrect. 59 // FIXME: Blob URLs don't have inner URLs. Their form is "blob:<inner-origin >/<UUID>", so treating the part after "blob:" as a URL is incorrect.
60 if (url.protocolIs("blob")) 60 if (url.protocolIs("blob"))
61 return true; 61 return true;
62 #endif 62 #endif
63 #if ENABLE(FILE_SYSTEM)
64 if (url.protocolIs("filesystem")) 63 if (url.protocolIs("filesystem"))
65 return true; 64 return true;
66 #endif
67 UNUSED_PARAM(url); 65 UNUSED_PARAM(url);
68 return false; 66 return false;
69 } 67 }
70 68
71 // In general, extracting the inner URL varies by scheme. It just so happens 69 // In general, extracting the inner URL varies by scheme. It just so happens
72 // that all the URL schemes we currently support that use inner URLs for their 70 // that all the URL schemes we currently support that use inner URLs for their
73 // security origin can be parsed using this algorithm. 71 // security origin can be parsed using this algorithm.
74 KURL SecurityOrigin::extractInnerURL(const KURL& url) 72 KURL SecurityOrigin::extractInnerURL(const KURL& url)
75 { 73 {
76 if (url.innerURL()) 74 if (url.innerURL())
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 } 591 }
594 592
595 const String& SecurityOrigin::urlWithUniqueSecurityOrigin() 593 const String& SecurityOrigin::urlWithUniqueSecurityOrigin()
596 { 594 {
597 ASSERT(isMainThread()); 595 ASSERT(isMainThread());
598 DEFINE_STATIC_LOCAL(const String, uniqueSecurityOriginURL, (ASCIILiteral("da ta:,"))); 596 DEFINE_STATIC_LOCAL(const String, uniqueSecurityOriginURL, (ASCIILiteral("da ta:,")));
599 return uniqueSecurityOriginURL; 597 return uniqueSecurityOriginURL;
600 } 598 }
601 599
602 } // namespace WebCore 600 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/page/DOMWindow.idl ('k') | Source/WebCore/platform/AsyncFileSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698