| OLD | NEW |
| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 namespace { | 56 namespace { |
| 57 | 57 |
| 58 void Log(NPP instance, const char* format, ...) { | 58 void Log(NPP instance, const char* format, ...) { |
| 59 va_list args; | 59 va_list args; |
| 60 va_start(args, format); | 60 va_start(args, format); |
| 61 std::string message("PLUGIN: "); | 61 std::string message("PLUGIN: "); |
| 62 #if defined(INDEPENDENT_PLUGIN) | 62 #if defined(INDEPENDENT_PLUGIN) |
| 63 char msgbuf[100]; | 63 char msgbuf[100]; |
| 64 vsnprintf(msgbuf, sizeof(msgbuf), format, args); | 64 vsnprintf(msgbuf, sizeof(msgbuf), format, args); |
| 65 #else | 65 #else |
| 66 StringAppendV(&message, format, args); | 66 base::StringAppendV(&message, format, args); |
| 67 #endif | 67 #endif |
| 68 va_end(args); | 68 va_end(args); |
| 69 | 69 |
| 70 NPObject* window_object = 0; | 70 NPObject* window_object = 0; |
| 71 NPError error = browser->getvalue(instance, NPNVWindowNPObject, | 71 NPError error = browser->getvalue(instance, NPNVWindowNPObject, |
| 72 &window_object); | 72 &window_object); |
| 73 if (error != NPERR_NO_ERROR) { | 73 if (error != NPERR_NO_ERROR) { |
| 74 LOG(ERROR) << "Failed to retrieve window object while logging: " | 74 LOG(ERROR) << "Failed to retrieve window object while logging: " |
| 75 << message; | 75 << message; |
| 76 return; | 76 return; |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 284 |
| 285 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 285 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 286 NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, void* value) { | 286 NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, void* value) { |
| 287 return NPP_GetValue(instance, variable, value); | 287 return NPP_GetValue(instance, variable, value); |
| 288 } | 288 } |
| 289 | 289 |
| 290 const char* API_CALL NP_GetMIMEDescription() { | 290 const char* API_CALL NP_GetMIMEDescription() { |
| 291 return "pepper-application/x-pepper-test-plugin::Pepper Test"; | 291 return "pepper-application/x-pepper-test-plugin::Pepper Test"; |
| 292 } | 292 } |
| 293 #endif | 293 #endif |
| OLD | NEW |