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

Side by Side Diff: webkit/tools/npapi_layout_test_plugin/main.cpp

Issue 149146: linux: fix a layout test by having our test plugin provide two mimetypes (Closed)
Patch Set: Created 11 years, 5 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
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Ap ple") in 2 IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Ap ple") in
3 consideration of your agreement to the following terms, and your use, installat ion, 3 consideration of your agreement to the following terms, and your use, installat ion,
4 modification or redistribution of this Apple software constitutes acceptance of these 4 modification or redistribution of this Apple software constitutes acceptance of these
5 terms. If you do not agree with these terms, please do not use, install, modif y or 5 terms. If you do not agree with these terms, please do not use, install, modif y or
6 redistribute this Apple software. 6 redistribute this Apple software.
7 7
8 In consideration of your agreement to abide by the following terms, and subject to these 8 In consideration of your agreement to abide by the following terms, and subject to these
9 terms, Apple grants you a personal, non-exclusive license, under Apple’s copyri ghts in 9 terms, Apple grants you a personal, non-exclusive license, under Apple’s copyri ghts in
10 this original Apple software (the "Apple Software"), to use, reproduce, modify and 10 this original Apple software (the "Apple Software"), to use, reproduce, modify and
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 return NPERR_GENERIC_ERROR; 490 return NPERR_GENERIC_ERROR;
491 } 491 }
492 492
493 #if defined(OS_LINUX) 493 #if defined(OS_LINUX)
494 NPError NP_GetValue(NPP instance, NPPVariable variable, void *value) 494 NPError NP_GetValue(NPP instance, NPPVariable variable, void *value)
495 { 495 {
496 return NPP_GetValue(instance, variable, value); 496 return NPP_GetValue(instance, variable, value);
497 } 497 }
498 498
499 const char* NP_GetMIMEDescription(void) { 499 const char* NP_GetMIMEDescription(void) {
500 return "application/x-webkit-test-netscape:testnetscape:test netscape conten t"; 500 // The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html
501 // asserts that the number of mimetypes handled by plugins should be
502 // greater than the number of plugins. This isn't true if we're
503 // the only plugin and we only handle one mimetype, so specify
504 // multiple mimetypes here.
505 return "application/x-webkit-test-netscape:testnetscape:test netscape conten t;"
506 "application/x-webkit-test-netscape2:testnetscape2:test netscape cont ent2";
501 } 507 }
502 #endif 508 #endif
OLDNEW
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698