diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:52:39 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:42 +0100 |
| commit | 5e86dc63da68e46049c5252367ef8b2a54016f0a (patch) | |
| tree | 2208c15081206389f2bbc510f7ebcd4e536982d9 /WebCore/plugins/npapi.cpp | |
| parent | 7ca64be9978f9d37eb50cfda93839328ab4d0440 (diff) | |
| download | external_webkit-5e86dc63da68e46049c5252367ef8b2a54016f0a.zip external_webkit-5e86dc63da68e46049c5252367ef8b2a54016f0a.tar.gz external_webkit-5e86dc63da68e46049c5252367ef8b2a54016f0a.tar.bz2 | |
Merge Webkit at r70209: Fix conflicts
WebCore/page/FrameView.cpp
http://trac.webkit.org/changeset/69896
WebCore/html/parser/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/69283
WebCore/html/HTMLPlugInElement.h
http://trac.webkit.org/changeset/69596
WebCore/html/HTMLInputElement.cpp
http://trac.webkit.org/changeset/68996
http://trac.webkit.org/changeset/69378
WebCore/plugins/npapi.cpp
http://trac.webkit.org/changeset/69808
WebCore/css/CSSComputedStyleDeclaration.cpp
http://trac.webkit.org/changeset/69220
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/69196
WebCore/rendering/style/RenderStyle.h
http://trac.webkit.org/changeset/68680
WebCore/rendering/RenderImage.cpp
http://trac.webkit.org/changeset/68917
WebCore/platform/android/FileSystemAndroid.cpp
http://trac.webkit.org/changeset/69594
WebCore/inspector/InspectorController.h
http://trac.webkit.org/changeset/68767
See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which
is why this is a conflict.
JavaScriptCore/parser/Parser.cpp
http://trac.webkit.org/changeset/69516
Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
Diffstat (limited to 'WebCore/plugins/npapi.cpp')
| -rw-r--r-- | WebCore/plugins/npapi.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/WebCore/plugins/npapi.cpp b/WebCore/plugins/npapi.cpp index 9d404b1..bc64901 100644 --- a/WebCore/plugins/npapi.cpp +++ b/WebCore/plugins/npapi.cpp @@ -176,23 +176,6 @@ void NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userDa PluginMainThreadScheduler::scheduler().scheduleCall(instance, func, userData); } -<<<<<<< HEAD -#ifdef PLUGIN_SCHEDULE_TIMER -uint32_t NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool repeat, - void (*timerFunc)(NPP npp, uint32_t timerID)) -{ - return pluginViewForInstance(instance)->scheduleTimer(instance, interval, - repeat != 0, timerFunc); -} - -void NPN_UnscheduleTimer(NPP instance, uint32_t timerID) -{ - pluginViewForInstance(instance)->unscheduleTimer(instance, timerID); -} -#endif - - -======= NPError NPN_GetValueForURL(NPP instance, NPNURLVariable variable, const char* url, char** value, uint32_t* len) { return pluginViewForInstance(instance)->getValueForURL(variable, url, value, len); @@ -207,4 +190,17 @@ NPError NPN_GetAuthenticationInfo(NPP instance, const char* protocol, const char { return pluginViewForInstance(instance)->getAuthenticationInfo(protocol, host, port, scheme, realm, username, ulen, password, plen); } ->>>>>>> webkit.org at r70209 + +#ifdef PLUGIN_SCHEDULE_TIMER +uint32_t NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool repeat, + void (*timerFunc)(NPP npp, uint32_t timerID)) +{ + return pluginViewForInstance(instance)->scheduleTimer(instance, interval, + repeat != 0, timerFunc); +} + +void NPN_UnscheduleTimer(NPP instance, uint32_t timerID) +{ + pluginViewForInstance(instance)->unscheduleTimer(instance, timerID); +} +#endif |