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

Side by Side Diff: Source/WebKit/chromium/src/WebDragData.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 m_private->addFilename(item.filenameData, item.displayNameData); 124 m_private->addFilename(item.filenameData, item.displayNameData);
125 return; 125 return;
126 case Item::StorageTypeBinaryData: 126 case Item::StorageTypeBinaryData:
127 // This should never happen when dragging in. 127 // This should never happen when dragging in.
128 ASSERT_NOT_REACHED(); 128 ASSERT_NOT_REACHED();
129 } 129 }
130 } 130 }
131 131
132 WebString WebDragData::filesystemId() const 132 WebString WebDragData::filesystemId() const
133 { 133 {
134 #if ENABLE(FILE_SYSTEM)
135 ASSERT(!isNull()); 134 ASSERT(!isNull());
136 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(m_pr ivate); 135 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(m_pr ivate);
137 if (filesystem) 136 if (filesystem)
138 return filesystem->filesystemId(); 137 return filesystem->filesystemId();
139 #endif
140 return WebString(); 138 return WebString();
141 } 139 }
142 140
143 void WebDragData::setFilesystemId(const WebString& filesystemId) 141 void WebDragData::setFilesystemId(const WebString& filesystemId)
144 { 142 {
145 #if ENABLE(FILE_SYSTEM)
146 // The ID is an opaque string, given by and validated by chromium port. 143 // The ID is an opaque string, given by and validated by chromium port.
147 ensureMutable(); 144 ensureMutable();
148 DraggedIsolatedFileSystem::provideTo(m_private, DraggedIsolatedFileSystem::s upplementName(), DraggedIsolatedFileSystem::create(filesystemId)); 145 DraggedIsolatedFileSystem::provideTo(m_private, DraggedIsolatedFileSystem::s upplementName(), DraggedIsolatedFileSystem::create(filesystemId));
149 #endif
150 } 146 }
151 147
152 WebDragData::WebDragData(const WTF::PassRefPtr<WebCore::ChromiumDataObject>& dat a) 148 WebDragData::WebDragData(const WTF::PassRefPtr<WebCore::ChromiumDataObject>& dat a)
153 : m_private(static_cast<WebDragDataPrivate*>(data.leakRef())) 149 : m_private(static_cast<WebDragDataPrivate*>(data.leakRef()))
154 { 150 {
155 } 151 }
156 152
157 WebDragData& WebDragData::operator=(const WTF::PassRefPtr<WebCore::ChromiumDataO bject>& data) 153 WebDragData& WebDragData::operator=(const WTF::PassRefPtr<WebCore::ChromiumDataO bject>& data)
158 { 154 {
159 assign(static_cast<WebDragDataPrivate*>(data.leakRef())); 155 assign(static_cast<WebDragDataPrivate*>(data.leakRef()));
(...skipping 13 matching lines...) Expand all
173 m_private = p; 169 m_private = p;
174 } 170 }
175 171
176 void WebDragData::ensureMutable() 172 void WebDragData::ensureMutable()
177 { 173 {
178 ASSERT(!isNull()); 174 ASSERT(!isNull());
179 ASSERT(m_private->hasOneRef()); 175 ASSERT(m_private->hasOneRef());
180 } 176 }
181 177
182 } // namespace WebKit 178 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/LocalFileSystemChromium.cpp ('k') | Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698