third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.

3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)	3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

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 29 matching lines...) Expand all Loading...
40	40

41 Database* DOMWindowWebDatabase::openDatabase(DOMWindow& windowArg, const String& name, const String& version, const String& displayName, unsigned long estimated Size, DatabaseCallback* creationCallback, ExceptionState& exceptionState)	41 Database* DOMWindowWebDatabase::openDatabase(DOMWindow& windowArg, const String& name, const String& version, const String& displayName, unsigned long estimated Size, DatabaseCallback* creationCallback, ExceptionState& exceptionState)

42 {	42 {

43 LocalDOMWindow& window = toLocalDOMWindow(windowArg);	43 LocalDOMWindow& window = toLocalDOMWindow(windowArg);

44 if (!window.isCurrentlyDisplayedInFrame())	44 if (!window.isCurrentlyDisplayedInFrame())

45 return nullptr;	45 return nullptr;

46	46

47 Database* database = nullptr;	47 Database* database = nullptr;

48 DatabaseManager& dbManager = DatabaseManager::manager();	48 DatabaseManager& dbManager = DatabaseManager::manager();

49 DatabaseError error = DatabaseError::None;	49 DatabaseError error = DatabaseError::None;

50 if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->security Origin()->canAccessDatabase()) {	50 if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->getSecur ityOrigin()->canAccessDatabase()) {

51 String errorMessage;	51 String errorMessage;

52 database = dbManager.openDatabase(window.document(), name, version, disp layName, estimatedSize, creationCallback, error, errorMessage);	52 database = dbManager.openDatabase(window.document(), name, version, disp layName, estimatedSize, creationCallback, error, errorMessage);

53 ASSERT(database \|\| error != DatabaseError::None);	53 ASSERT(database \|\| error != DatabaseError::None);

54 if (error != DatabaseError::None)	54 if (error != DatabaseError::None)

55 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage, exceptionState);	55 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage, exceptionState);

56 } else {	56 } else {

57 exceptionState.throwSecurityError("Access to the WebDatabase API is deni ed in this context.");	57 exceptionState.throwSecurityError("Access to the WebDatabase API is deni ed in this context.");

58 }	58 }

59	59

60 return database;	60 return database;

61 }	61 }

62	62

63 } // namespace blink	63 } // namespace blink

OLD	NEW