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

Side by Side Diff: third_party/WebKit/Source/web/IndexedDBClientImpl.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 IndexedDBClient* IndexedDBClientImpl::create() 43 IndexedDBClient* IndexedDBClientImpl::create()
44 { 44 {
45 return new IndexedDBClientImpl(); 45 return new IndexedDBClientImpl();
46 } 46 }
47 47
48 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, const String & name) 48 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, const String & name)
49 { 49 {
50 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerG lobalScope()); 50 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerG lobalScope());
51 51
52 if (context->isDocument()) { 52 if (context->isDocument()) {
53 WebSecurityOrigin origin(context->securityOrigin()); 53 WebSecurityOrigin origin(context->getSecurityOrigin());
54 Document* document = toDocument(context); 54 Document* document = toDocument(context);
55 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra me()); 55 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra me());
56 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and content_shell http://crbug.com/137269 56 // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and content_shell http://crbug.com/137269
57 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl ient()->allowIndexedDB(name, origin); 57 return !webFrame->contentSettingsClient() || webFrame->contentSettingsCl ient()->allowIndexedDB(name, origin);
58 } 58 }
59 59
60 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context); 60 WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context);
61 return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB( name); 61 return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB( name);
62 } 62 }
63 63
64 } // namespace blink 64 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698