Merge 141057

Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 182 matching lines @@
     , m_name(name.isolatedCopy())
     , m_expectedVersion(expectedVersion.isolatedCopy())
     , m_displayName(displayName.isolatedCopy())
     , m_estimatedSize(estimatedSize)
     , m_guid(0)
     , m_opened(false)
     , m_new(false)
     , m_isSyncDatabase(databaseType == SyncDatabase)
 {
     ASSERT(context->isContextThread());
-    m_contextThreadSecurityOrigin = m_scriptExecutionContext->securityOrigin();
+    m_contextThreadSecurityOrigin = m_scriptExecutionContext->securityOrigin()->isolatedCopy();
 
     m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
 
     if (m_name.isNull())
         m_name = "";
 
     {
         MutexLocker locker(guidMutex());
         m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
         HashSet<AbstractDatabase*>* hashSet = guidToDatabaseMap().get(m_guid);
@@ skipping 394 matching lines @@
 void AbstractDatabase::reportChangeVersionResult(int, int, int) { }
 void AbstractDatabase::reportStartTransactionResult(int, int, int) { }
 void AbstractDatabase::reportCommitTransactionResult(int, int, int) { }
 void AbstractDatabase::reportExecuteStatementResult(int, int, int) { }
 void AbstractDatabase::reportVacuumDatabaseResult(int) { }
 #endif // PLATFORM(CHROMIUM)
 
 } // namespace WebCore
 
 #endif // ENABLE(SQL_DATABASE)