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

Side by Side Diff: Source/WebKit/chromium/WebKit.gypi

Issue 12549003: Merge 144323 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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) 2010 Google Inc. All rights reserved. 2 # Copyright (C) 2010 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'tests/FakeWebPlugin.cpp', 68 'tests/FakeWebPlugin.cpp',
69 'tests/FakeWebPlugin.h', 69 'tests/FakeWebPlugin.h',
70 'tests/FakeWebGraphicsContext3D.h', 70 'tests/FakeWebGraphicsContext3D.h',
71 'tests/FilterOperationsTest.cpp', 71 'tests/FilterOperationsTest.cpp',
72 'tests/FrameLoaderClientImplTest.cpp', 72 'tests/FrameLoaderClientImplTest.cpp',
73 'tests/FrameTestHelpers.cpp', 73 'tests/FrameTestHelpers.cpp',
74 'tests/FrameTestHelpers.h', 74 'tests/FrameTestHelpers.h',
75 'tests/GraphicsLayerChromiumTest.cpp', 75 'tests/GraphicsLayerChromiumTest.cpp',
76 'tests/IDBAbortOnCorruptTest.cpp', 76 'tests/IDBAbortOnCorruptTest.cpp',
77 'tests/IDBBindingUtilitiesTest.cpp', 77 'tests/IDBBindingUtilitiesTest.cpp',
78 'tests/IDBCleanupOnIOErrorTest.cpp',
78 'tests/IDBDatabaseBackendTest.cpp', 79 'tests/IDBDatabaseBackendTest.cpp',
79 'tests/IDBFakeBackingStore.h', 80 'tests/IDBFakeBackingStore.h',
80 'tests/IDBKeyPathTest.cpp', 81 'tests/IDBKeyPathTest.cpp',
81 'tests/IDBLevelDBCodingTest.cpp', 82 'tests/IDBLevelDBCodingTest.cpp',
82 'tests/IDBRequestTest.cpp', 83 'tests/IDBRequestTest.cpp',
83 'tests/ImageDecodingStoreTest.cpp', 84 'tests/ImageDecodingStoreTest.cpp',
84 'tests/ImageFrameGeneratorTest.cpp', 85 'tests/ImageFrameGeneratorTest.cpp',
85 'tests/ImageLayerChromiumTest.cpp', 86 'tests/ImageLayerChromiumTest.cpp',
86 'tests/MockDiscardablePixelRef.h', 87 'tests/MockDiscardablePixelRef.h',
87 'tests/MockImageDecoder.h', 88 'tests/MockImageDecoder.h',
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 }], 163 }],
163 ], 164 ],
164 }, 165 },
165 } 166 }
166 167
167 # Local Variables: 168 # Local Variables:
168 # tab-width:2 169 # tab-width:2
169 # indent-tabs-mode:nil 170 # indent-tabs-mode:nil
170 # End: 171 # End:
171 # vim: set expandtab tabstop=2 shiftwidth=2: 172 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/WebKit.gyp ('k') | Source/WebKit/chromium/tests/IDBCleanupOnIOErrorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698