diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /webkit/tools/npapi_layout_test_plugin/TestObject.cpp | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin/TestObject.cpp')
-rw-r--r-- | webkit/tools/npapi_layout_test_plugin/TestObject.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/TestObject.cpp b/webkit/tools/npapi_layout_test_plugin/TestObject.cpp index e82ba13..659da76 100644 --- a/webkit/tools/npapi_layout_test_plugin/TestObject.cpp +++ b/webkit/tools/npapi_layout_test_plugin/TestObject.cpp @@ -20,7 +20,7 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "TestObject.h" @@ -35,10 +35,10 @@ static bool testGetProperty(NPObject *obj, NPIdentifier name, NPVariant *variant static NPObject *testAllocate(NPP npp, NPClass *theClass); static void testDeallocate(NPObject *obj); -static NPClass testClass = { +static NPClass testClass = { NP_CLASS_STRUCT_VERSION, - testAllocate, - testDeallocate, + testAllocate, + testDeallocate, 0, 0, 0, @@ -88,16 +88,16 @@ static NPObject *testAllocate(NPP npp, NPClass *theClass) static_cast<TestObject*>(malloc(sizeof(TestObject))); newInstance->testObject = NULL; ++testObjectCount; - + if (!identifiersInitialized) { identifiersInitialized = true; initializeIdentifiers(); } - + return reinterpret_cast<NPObject*>(newInstance); } -static void testDeallocate(NPObject *obj) +static void testDeallocate(NPObject *obj) { TestObject *testObject = reinterpret_cast<TestObject*>(obj); if (testObject->testObject) @@ -119,11 +119,11 @@ static bool testHasProperty(NPObject *obj, NPIdentifier name) if (testIdentifiers[i] == name) return true; } - + return false; } -static bool testGetProperty(NPObject *obj, NPIdentifier name, +static bool testGetProperty(NPObject *obj, NPIdentifier name, NPVariant *variant) { if (name == testIdentifiers[ID_PROPERTY_FOO]) { @@ -151,10 +151,10 @@ static bool testGetProperty(NPObject *obj, NPIdentifier name, static bool testEnumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count) { *count = NUM_TEST_IDENTIFIERS; - + *value = (NPIdentifier*)browser->memalloc(NUM_TEST_IDENTIFIERS * sizeof(NPIdentifier)); memcpy(*value, testIdentifiers, sizeof(NPIdentifier) * NUM_TEST_IDENTIFIERS); - + return true; } |