Changeset 88513 in webkit


Ignore:
Timestamp:
Jun 9, 2011, 6:59:33 PM (14 years ago)
Author:
Csaba Osztrogonác
Message:

Unreviewed rolling out r88471, because it broke plugin tests on Qt.

Tools:

  • DumpRenderTree/TestNetscapePlugIn/main.cpp:

(handleEventX11):
(NPP_GetValue):

  • DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
  • DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: Added.

(webkit_test_plugin_new_instance):
(webkit_test_plugin_destroy_instance):
(webkit_test_plugin_set_window):
(executeScript):
(webkit_test_plugin_new_stream):
(webkit_test_plugin_destroy_stream):
(webkit_test_plugin_stream_as_file):
(webkit_test_plugin_write_ready):
(webkit_test_plugin_write):
(webkit_test_plugin_print):
(keyEventToChar):
(webkit_test_plugin_handle_event):
(webkit_test_plugin_url_notify):
(webkit_test_plugin_get_value):
(webkit_test_plugin_set_value):
(NP_GetMIMEDescription):
(NP_Initialize):
(NP_Shutdown):
(NP_GetValue):

  • GNUmakefile.am:

LayoutTests:

  • platform/chromium-linux/plugins/mouse-events-expected.txt:
Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r88511 r88513  
     12011-06-09  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Unreviewed rolling out r88471, because it broke plugin tests on Qt.
     4
     5        * platform/chromium-linux/plugins/mouse-events-expected.txt:
     6
    172011-06-09  Kent Tamura  <tkent@chromium.org>
    28

  • trunk/LayoutTests/platform/chromium-linux/plugins/mouse-events-expected.txt

    r88482 r88513  
     1CONSOLE MESSAGE: line 17: PLUGIN: adjustCursorEvent
     2CONSOLE MESSAGE: line 17: PLUGIN: adjustCursorEvent
    13CONSOLE MESSAGE: line 18: PLUGIN: getFocusEvent
    24CONSOLE MESSAGE: line 18: PLUGIN: mouseDown at (12, 12)
    35CONSOLE MESSAGE: line 19: PLUGIN: mouseUp at (12, 12)
     6CONSOLE MESSAGE: line 20: PLUGIN: adjustCursorEvent
    47CONSOLE MESSAGE: line 21: PLUGIN: mouseDown at (22, 22)
     8CONSOLE MESSAGE: line 23: PLUGIN: adjustCursorEvent
    59CONSOLE MESSAGE: line 23: PLUGIN: mouseUp at (32, 22)
     10CONSOLE MESSAGE: line 24: PLUGIN: adjustCursorEvent
    611
    712Test for bug 11517: Flash clicks/interactivity not working properly.

  • trunk/Tools/ChangeLog

    r88498 r88513  
     12011-06-09  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Unreviewed rolling out r88471, because it broke plugin tests on Qt.
     4
     5        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
     6        (handleEventX11):
     7        (NPP_GetValue):
     8        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
     9        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: Added.
     10        (webkit_test_plugin_new_instance):
     11        (webkit_test_plugin_destroy_instance):
     12        (webkit_test_plugin_set_window):
     13        (executeScript):
     14        (webkit_test_plugin_new_stream):
     15        (webkit_test_plugin_destroy_stream):
     16        (webkit_test_plugin_stream_as_file):
     17        (webkit_test_plugin_write_ready):
     18        (webkit_test_plugin_write):
     19        (webkit_test_plugin_print):
     20        (keyEventToChar):
     21        (webkit_test_plugin_handle_event):
     22        (webkit_test_plugin_url_notify):
     23        (webkit_test_plugin_get_value):
     24        (webkit_test_plugin_set_value):
     25        (NP_GetMIMEDescription):
     26        (NP_Initialize):
     27        (NP_Shutdown):
     28        (NP_GetValue):
     29        * GNUmakefile.am:
     30
    1312011-06-09  Martin Robinson  <mrobinson@igalia.com>
    232

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp

    r88471 r88513  
    2828#include "PluginTest.h"
    2929#include <cstdlib>
    30 #include <cstring>
    3130#include <string>
    3231
    3332#ifdef XP_UNIX
    3433#include <X11/Xlib.h>
    35 #include <X11/Xutil.h>
    3634#endif
    3735
    … …  
    625623
    626624#ifdef XP_UNIX
    627 
    628 static char keyEventToChar(XKeyEvent* event)
    629 {
    630     char c = ' ';
    631     XLookupString(event, &c, sizeof(c), 0, 0);
    632     return c;
    633 }
    634 
    635625static int16_t handleEventX11(NPP instance, PluginObject* obj, XEvent* event)
    636626{
     627    XButtonPressedEvent* buttonPressEvent = reinterpret_cast<XButtonPressedEvent*>(event);
     628    XButtonReleasedEvent* buttonReleaseEvent = reinterpret_cast<XButtonReleasedEvent*>(event);
    637629    switch (event->type) {
    638630    case ButtonPress:
    639631        if (obj->eventLogging)
    640             pluginLog(instance, "mouseDown at (%d, %d)", event->xbutton.x, event->xbutton.y);
     632            pluginLog(instance, "mouseDown at (%d, %d)", buttonPressEvent->x, buttonPressEvent->y);
    641633        if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)
    642634            executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
    … …  
    644636    case ButtonRelease:
    645637        if (obj->eventLogging)
    646             pluginLog(instance, "mouseUp at (%d, %d)", event->xbutton.x, event->xbutton.y);
     638            pluginLog(instance, "mouseUp at (%d, %d)", buttonReleaseEvent->x, buttonReleaseEvent->y);
    647639        break;
    648640    case KeyPress:
    649641        // FIXME: extract key code
    650642        if (obj->eventLogging)
    651             pluginLog(instance, "keyDown '%c'", keyEventToChar(&event->xkey));
     643            pluginLog(instance, "NOTIMPLEMENTED: keyDown '%c'", ' ');
    652644        if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)
    653645            executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
    … …  
    656648        // FIXME: extract key code
    657649        if (obj->eventLogging)
    658             pluginLog(instance, "keyUp '%c'", keyEventToChar(&event->xkey));
     650            pluginLog(instance, "NOTIMPLEMENTED: keyUp '%c'", ' ');
    659651        break;
    660652    case GraphicsExpose:
    … …  
    676668    case LeaveNotify:
    677669    case MotionNotify:
     670        if (obj->eventLogging)
     671            pluginLog(instance, "adjustCursorEvent");
    678672        break;
    679673    default:
    … …  
    787781        return NPERR_NO_ERROR;
    788782    }
    789     if (variable == NPPVpluginNeedsXEmbed) {
    790         *((NPBool *)value) = TRUE;
    791         return NPERR_NO_ERROR;
    792     }
    793783#endif
    794784

  • trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro

    r88471 r88513  
    2929          PluginTest.cpp \
    3030          TestObject.cpp \
    31           main.cpp \
    3231          Tests/DocumentOpenInDestroyStream.cpp \
    3332          Tests/EvaluateJSAfterRemovingPluginElement.cpp \
    … …  
    4544
    4645mac {
     46    SOURCES += ../../TestNetscapePlugIn/main.cpp
    4747    OBJECTIVE_SOURCES += PluginObjectMac.mm
    4848    LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
     49} else {
     50    SOURCES += ../../unix/TestNetscapePlugin/TestNetscapePlugin.cpp
    4951}
    5052

  • trunk/Tools/GNUmakefile.am

    r88471 r88513  
    217217        Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
    218218        Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h \
     219        Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp \
    219220        Tools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \
    220221        Tools/DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp \
    … …  
    235236        Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h \
    236237        Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp \
    237         Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.h \
    238         Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp
     238        Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.h
    239239
    240240TestNetscapePlugin_libtestnetscapeplugin_la_LDFLAGS = \
Note: See TracChangeset for help on using the changeset viewer.