Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1f5e9e5 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

Merge changes I8da1b801,Id88446d6,I82798d5a 

* changes:
  Merge Webkit at r58956: Update User agent with new WebKit version.
  Merge Webkit at r58956: Update DRT FileFilter.
  Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
parents 8d3257a7 f4442311

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ 


    <!-- Do not translate.  WebView User Agent string -->

    <string name="web_user_agent" translatable="false"><xliff:g id="x">Mozilla/5.0 (Linux; U; Android %s)

        AppleWebKit/533.6 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.6</xliff:g></string>

        AppleWebKit/533.9 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.9</xliff:g></string>



    <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->

    <string name="js_dialog_title">The page at \'<xliff:g id="title">%s</xliff:g>\' says:</string>

tests/BrowserTestPlugin/jni/PluginObject.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class SubPlugin { 
public:

    SubPlugin(NPP inst) : m_inst(inst) {}

    virtual ~SubPlugin() {}

    virtual int16 handleEvent(const ANPEvent* evt) = 0;

    virtual int16_t handleEvent(const ANPEvent* evt) = 0;



    NPP inst() const { return m_inst; }

tests/BrowserTestPlugin/jni/event/EventPlugin.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void EventPlugin::printToDiv(const char* text, int length) { 
    browser->memfree(beginMem);

}



int16 EventPlugin::handleEvent(const ANPEvent* evt) {

int16_t EventPlugin::handleEvent(const ANPEvent* evt) {

    switch (evt->eventType) {



        case kDraw_ANPEventType: {

tests/BrowserTestPlugin/jni/event/EventPlugin.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class EventPlugin : public SubPlugin { 
public:

    EventPlugin(NPP inst);

    virtual ~EventPlugin();

    virtual int16 handleEvent(const ANPEvent* evt);

    virtual int16_t handleEvent(const ANPEvent* evt);



private:

    void drawPlugin(const ANPBitmap& bitmap, const ANPRectI& clip);

tests/BrowserTestPlugin/jni/main.cpp

+10 −10
Original line number Diff line number Diff line
@@ -34,19 +34,19 @@ 
NPNetscapeFuncs* browser;

#define EXPORT __attribute__((visibility("default")))



NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,

NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,

        char* argn[], char* argv[], NPSavedData* saved);

NPError NPP_Destroy(NPP instance, NPSavedData** save);

NPError NPP_SetWindow(NPP instance, NPWindow* window);

NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,

        NPBool seekable, uint16* stype);

        NPBool seekable, uint16_t* stype);

NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);

int32   NPP_WriteReady(NPP instance, NPStream* stream);

int32   NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,

int32_t   NPP_WriteReady(NPP instance, NPStream* stream);

int32_t   NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,

        void* buffer);

void    NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname);

void    NPP_Print(NPP instance, NPPrint* platformPrint);

int16   NPP_HandleEvent(NPP instance, void* event);

int16_t   NPP_HandleEvent(NPP instance, void* event);

void    NPP_URLNotify(NPP instance, const char* URL, NPReason reason,

        void* notifyData);

NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value);
@@ -129,7 +129,7 @@ const char *NP_GetMIMEDescription(void) 
    return "application/x-browsertestplugin:btp:Android Browser Test Plugin";

}



NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,

NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,

                char* argn[], char* argv[], NPSavedData* saved)

{
@@ -188,7 +188,7 @@ NPError NPP_SetWindow(NPP instance, NPWindow* window) 
    return NPERR_NO_ERROR;

}



NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype)

NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype)

{

    *stype = NP_ASFILEONLY;

    return NPERR_NO_ERROR;
@@ -199,12 +199,12 @@ NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason) 
    return NPERR_NO_ERROR;

}



int32 NPP_WriteReady(NPP instance, NPStream* stream)

int32_t NPP_WriteReady(NPP instance, NPStream* stream)

{

    return 0;

}



int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer)

int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer)

{

    return 0;

}
@@ -217,7 +217,7 @@ void NPP_Print(NPP instance, NPPrint* platformPrint) 
{

}



int16 NPP_HandleEvent(NPP instance, void* event)

int16_t NPP_HandleEvent(NPP instance, void* event)

{

    PluginObject *obj = reinterpret_cast<PluginObject*>(instance->pdata);

    const ANPEvent* evt = reinterpret_cast<const ANPEvent*>(event);