[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 635a0da4582f1dd4401deb67103915c02f66c111
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 04:49:27 2010 +0000

    2010-12-02  Simon Fraser  <simon.fraser at apple.com>
    
            Fix Chromium Linux plugin tests by not logging
            unconditionally from the event handling code.
    
            * DumpRenderTree/TestNetscapePlugIn/main.cpp:
            (handleEventX11):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73236 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2de59e7..d343d56 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-02  Simon Fraser  <simon.fraser at apple.com>
+
+        Fix Chromium Linux plugin tests by not logging
+        unconditionally from the event handling code.
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+        (handleEventX11):
+
 2010-12-02  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
index f7a420b..39a3392 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
@@ -613,40 +613,49 @@ static int16_t handleEventX11(NPP instance, PluginObject* obj, XEvent* event)
     XButtonReleasedEvent* buttonReleaseEvent = reinterpret_cast<XButtonReleasedEvent*>(event);
     switch (event->type) {
     case ButtonPress:
-        pluginLog(instance, "mouseDown at (%d, %d)", buttonPressEvent->x, buttonPressEvent->y);
+        if (obj->eventLogging)
+            pluginLog(instance, "mouseDown at (%d, %d)", buttonPressEvent->x, buttonPressEvent->y);
         if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)
             executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
         break;
     case ButtonRelease:
-        pluginLog(instance, "mouseUp at (%d, %d)", buttonReleaseEvent->x, buttonReleaseEvent->y);
+        if (obj->eventLogging)
+            pluginLog(instance, "mouseUp at (%d, %d)", buttonReleaseEvent->x, buttonReleaseEvent->y);
         break;
     case KeyPress:
         // FIXME: extract key code
-        pluginLog(instance, "NOTIMPLEMENTED: keyDown '%c'", ' ');
+        if (obj->eventLogging)
+            pluginLog(instance, "NOTIMPLEMENTED: keyDown '%c'", ' ');
         if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)
             executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
         break;
     case KeyRelease:
         // FIXME: extract key code
-        pluginLog(instance, "NOTIMPLEMENTED: keyUp '%c'", ' ');
+        if (obj->eventLogging)
+            pluginLog(instance, "NOTIMPLEMENTED: keyUp '%c'", ' ');
         break;
     case GraphicsExpose:
-        pluginLog(instance, "updateEvt");
+        if (obj->eventLogging)
+            pluginLog(instance, "updateEvt");
         break;
     // NPAPI events
     case FocusIn:
-        pluginLog(instance, "getFocusEvent");
+        if (obj->eventLogging)
+            pluginLog(instance, "getFocusEvent");
         break;
     case FocusOut:
-        pluginLog(instance, "loseFocusEvent");
+        if (obj->eventLogging)
+            pluginLog(instance, "loseFocusEvent");
         break;
     case EnterNotify:
     case LeaveNotify:
     case MotionNotify:
-        pluginLog(instance, "adjustCursorEvent");
+        if (obj->eventLogging)
+            pluginLog(instance, "adjustCursorEvent");
         break;
     default:
-        pluginLog(instance, "event %d", event->type);
+        if (obj->eventLogging)
+            pluginLog(instance, "event %d", event->type);
     }
 
     fflush(stdout);

-- 
WebKit Debian packaging