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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/Database.cpp

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years, 1 month 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) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 createDatabaseIdentifierFromSecurityOrigin(securityOrigin()), 760 createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
761 stringIdentifier(), sqliteErrorCode); 761 stringIdentifier(), sqliteErrorCode);
762 } 762 }
763 } 763 }
764 764
765 void Database::logErrorMessage(const String& message) 765 void Database::logErrorMessage(const String& message)
766 { 766 {
767 executionContext()->addConsoleMessage(ConsoleMessage::create(StorageMessageS ource, ErrorMessageLevel, message)); 767 executionContext()->addConsoleMessage(ConsoleMessage::create(StorageMessageS ource, ErrorMessageLevel, message));
768 } 768 }
769 769
770 DatabaseContext* Database::databaseContext() const
771 {
772 return m_databaseContext;
773 }
774
775 ExecutionContext* Database::executionContext() const 770 ExecutionContext* Database::executionContext() const
776 { 771 {
777 return databaseContext()->executionContext(); 772 return databaseContext()->executionContext();
778 } 773 }
779 774
780 void Database::closeImmediately() 775 void Database::closeImmediately()
781 { 776 {
782 ASSERT(executionContext()->isContextThread()); 777 ASSERT(executionContext()->isContextThread());
783 if (databaseContext()->databaseThreadAvailable() && opened()) { 778 if (databaseContext()->databaseThreadAvailable() && opened()) {
784 logErrorMessage("forcibly closing database"); 779 logErrorMessage("forcibly closing database");
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 SecurityOrigin* Database::securityOrigin() const 896 SecurityOrigin* Database::securityOrigin() const
902 { 897 {
903 if (executionContext()->isContextThread()) 898 if (executionContext()->isContextThread())
904 return m_contextThreadSecurityOrigin.get(); 899 return m_contextThreadSecurityOrigin.get();
905 if (databaseContext()->databaseThread()->isDatabaseThread()) 900 if (databaseContext()->databaseThread()->isDatabaseThread())
906 return m_databaseThreadSecurityOrigin.get(); 901 return m_databaseThreadSecurityOrigin.get();
907 return 0; 902 return 0;
908 } 903 }
909 904
910 } // namespace blink 905 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698