Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Implement more NPRuntime related NPN_ functions
https://bugs.webkit.org/show_bug.cgi?id=42520 Reviewed by Sam Weinig. * WebKit2.xcodeproj/project.pbxproj: * WebProcess/Plugins/NPRuntimeUtilities.cpp: Added. * WebProcess/Plugins/NPRuntimeUtilities.h: Added. Add new file with NPRuntime related utility functions. * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: (WebKit::NPN_CreateObject): (WebKit::NPN_RetainObject): (WebKit::NPN_ReleaseObject): Call the corresponding NPRuntimeUtilities functions. Canonical link: https://commits.webkit.org/54470@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
with
162 additions
and 17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright (C) 2010 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 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. | ||
| */ | ||
|
|
||
| #include "NPRuntimeUtilities.h" | ||
|
|
||
| namespace WebKit { | ||
|
|
||
| NPObject* createNPObject(NPP npp, NPClass* npClass) | ||
| { | ||
| ASSERT(npClass); | ||
|
|
||
| NPObject* npObject; | ||
| if (npClass->allocate) | ||
| npObject = npClass->allocate(npp, npClass); | ||
| else { | ||
| // This should really call NPN_MemAlloc, but we know that it uses malloc | ||
| // under the hood so it's fine. | ||
| npObject = static_cast<NPObject*>(malloc(sizeof(NPObject))); | ||
| } | ||
|
|
||
| npObject->_class = npClass; | ||
| npObject->referenceCount = 1; | ||
|
|
||
| return npObject; | ||
| } | ||
|
|
||
| void deallocateNPObject(NPObject* npObject) | ||
| { | ||
| ASSERT(npObject); | ||
| if (!npObject) | ||
| return; | ||
|
|
||
| if (npObject->_class->deallocate) | ||
| npObject->_class->deallocate(npObject); | ||
| else { | ||
| // This should really call NPN_MemFree, but we know that it uses free | ||
| // under the hood so it's fine. | ||
| free(npObject); | ||
| } | ||
| } | ||
|
|
||
| void retainNPObject(NPObject* npObject) | ||
| { | ||
| ASSERT(npObject); | ||
| if (!npObject) | ||
| return; | ||
|
|
||
| npObject->referenceCount++; | ||
| } | ||
|
|
||
| void releaseNPObject(NPObject* npObject) | ||
| { | ||
| ASSERT(npObject); | ||
| if (!npObject) | ||
| return; | ||
|
|
||
| ASSERT(npObject->referenceCount >= 1); | ||
| npObject->referenceCount--; | ||
| if (!npObject->referenceCount) | ||
| deallocateNPObject(npObject); | ||
| } | ||
|
|
||
| } // namespace WebKit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Copyright (C) 2010 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 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. | ||
| */ | ||
|
|
||
| #ifndef NPRuntimeUtilities_h | ||
| #define NPRuntimeUtilities_h | ||
|
|
||
| #include <WebCore/npruntime.h> | ||
|
|
||
| struct NPClass; | ||
| struct NPObject; | ||
|
|
||
| namespace WebKit { | ||
|
|
||
| NPObject* createNPObject(NPP, NPClass*); | ||
| void deallocateNPObject(NPObject*); | ||
|
|
||
| void retainNPObject(NPObject*); | ||
| void releaseNPObject(NPObject*); | ||
|
|
||
| } | ||
|
|
||
| #endif // NPRuntimeUtilities_h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters