root/trunk/llmozlib2/build_mozilla/linden.patch

layout/generic/nsObjectFrame.cpp

@@ -1784 +1784 @@
-  return rv;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    // first, we need to get the document
-    nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
-    NS_ENSURE_TRUE(doc, NS_ERROR_NULL_POINTER);
@@ -1837 +1817 @@
-      objectFrame = GetNextObjectFrame(aPresContext,frame);
-    NS_ENSURE_TRUE(objectFrame,NS_ERROR_FAILURE);
-
-
-
-
+
+
+
+
-      return NS_ERROR_FAILURE;
+  NS_IF_ADDREF(aPlugInstance = tempPluginInstance);
-
-    // now we need to setup the correct location for printing
-    nsresult rv;
-    nsPluginWindow    window;
-    nsPoint           origin;
-    float             t2p;
-  window.window =  
+aPlugWin.window =
-
-    // prepare embedded mode printing struct
-
-
+
-
-    // we need to find out if we are windowless or not
-    PRBool windowless = PR_FALSE;
-  pi
-  window
+aPlugInstance
+aPlugWin
-
-    // Get the offset of the DC
-    nsTransform2D* rcTransform;
@@ -1868 +1847 @@
-
-    // set it all up
-    // XXX is windowless different?
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-// XXX platform specific printing code
-#if defined(XP_MAC) && !TARGET_CARBON
@@ -1896 +1917 @@
-    
-    window.window = &port;
-    npprint.print.embedPrint.platformPrint = (void*)window.window;
-    npprint.print.embedPrint.window = window;
-    // send off print info to plugin
-    rv = pi->Print(&npprint);
-#elif defined(XP_UNIX) && !defined(XP_MACOSX)
@@ -1925 +1945 @@
-    window.y =   aDirtyRect.y;
-    window.width =   aDirtyRect.width;
-    window.height =   aDirtyRect.height;
-    npprint.print.embedPrint.window        = window;
-    rv = pi->Print(&npprint);
-    if (NS_FAILED(rv)) {
-      PR_LOG(nsObjectFrameLM, PR_LOG_DEBUG, ("error: plugin returned failure %lx\n", (long)rv));
@@ -1951 +1970 @@
-      return NS_OK;  // no dc implemented so quit
-
-    npprint.print.embedPrint.platformPrint = (void*)pDC;
-    npprint.print.embedPrint.window = window;
-    // send off print info to plugin
-    rv = pi->Print(&npprint);
-
@@ -1965 +1983 @@
-#endif
-
-    // XXX Nav 4.x always sent a SetWindow call after print. Should we do the same?
+    /* XXXjgaunt - commenting this out because we lost the frame in
+                 - re-factoring. (setupPrinting())
+                 - Is this really necessary???
-    nsDidReflowStatus status = NS_FRAME_REFLOW_FINISHED; // should we use a special status?
-    frame->DidReflow(shell->GetPresContext(),
-                     nsnull, status);  // DidReflow will take care of it
+    */
-
-    return rv;  // done with printing
-  }
@@ -1978 +2000 @@
-  if ((NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) && mInstanceOwner)
-      mInstanceOwner->Paint(aDirtyRect);
-#elif defined (XP_WIN) || defined(XP_OS2)
-  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
-    nsCOMPtr<nsIPluginInstance> inst;
-    GetPluginInstance(*getter_AddRefs(inst));
-
+
+
-      // Look if it's windowless
-      nsPluginWindow * window;
-      mInstanceOwner->GetWindow(window);
-
-
+
+
-        // check if we need to call SetWindow with updated parameters
-        PRBool doupdatewindow = PR_FALSE;
-
@@ -2058 +2081 @@
-#endif
-
-          inst->SetWindow(window);        
-        }
-
-        mInstanceOwner->Paint(aDirtyRect, hdc);
-      }
-    }
+  else if (window->type == nsPluginWindowType_Window &&
+           eFramePaintLayer_Content == aWhichLayer) {
+    // This section handles the case of being called from
+    //   nsViewManager::RenderOffscreen(). That call is made
+    //   from the nsCanvas impl as well as for some embedding
+    //   applications.
+    // We must set things up like we are printing and then
+    //   have the plugin render to a DeviceContext created
+    //   in RenderOffscreen()
+    // We may also get here during regular operation. In that
+    //   case the location we tell the plugin to print is
+    //   merely it's own window.
+
+    // data to pass on to the plugin
+    nsPluginPrint  npprint;
+    nsPluginWindow window;
+    nsCOMPtr<nsIPluginInstance> pi;
+    nsresult rv;
+
+    // sets fields in the plugin structs and gets the plugin instance
+    rv = SetupPrinting(aRenderingContext, aPresContext, window, npprint, (*getter_AddRefs(pi)));
+    if (NS_FAILED(rv))
+      return rv;
+
+#ifdef XP_WIN
+    // This will be the plugin's window's DC or one provided by RenderOffscreen
+    PRUint32 pDC = 0;
+    aRenderingContext.RetrieveCurrentNativeGraphicData((void**)&pDC);
+    if (!pDC)
+      return NS_OK;  // no dc implemented so quit
+
+    // set the context to print to
+    npprint.print.embedPrint.platformPrint = (void*) pDC;
+
+    // tell the plugin to render to the DC - works for Flash, not for quicktime
+    rv = pi->Print(&npprint);
+
+ // XXXjgaunt - try sending a WM_PRINTCLIENT w/ PRF_CLIENT in lparam and DC in wparam
+/*
+    nsPluginWindowHelper helper;
+
+    nsPluginEvent pPluginEvent;
+    pPluginEvent.event  = WM_PRINTCLIENT;
+    pPluginEvent.wParam = (PRUint32) pDC;
+    pPluginEvent.lParam = PRF_CLIENT;
+
+    // call the WinProc with the HWND and the event (message,wparam,lparam)
+    helper.LLSendEventToWindow((void*) &window, (void*) mInstanceOwner->GetPluginPort(), (void*) &pPluginEvent);
+*/
+
+#endif /* XP_WIN */
-  }
-#endif /* !XP_MAC */
-  DO_GLOBAL_REFLOW_COUNT_DSP("nsObjectFrame", &aRenderingContext);
@@ -2090 +2163 @@
-  }
-
-#ifdef XP_WIN
+  // XXXjgaunt - added the windowless check
+  PRBool windowless = PR_FALSE;
+  nsCOMPtr<nsIPluginInstance> pluginInstance;
+  GetPluginInstance(*getter_AddRefs(pluginInstance));
+
+  if(pluginInstance)
+    pluginInstance->GetValue(nsPluginInstanceVariable_WindowlessBool,
+                             (void *)&windowless);
+
+  if (windowless) {
-  rv = nsObjectFrameSuper::HandleEvent(aPresContext, anEvent, anEventStatus);
+  }
+  else {
+    *anEventStatus = mInstanceOwner->ProcessEvent(*anEvent);
+    rv = *anEventStatus;
+  }
-  return rv;
-#endif
-
@@ -3893 +3981 @@
-#endif
-
-#ifdef XP_WIN
-  // this code supports windowless plugins
-  nsPluginEvent * pPluginEvent = (nsPluginEvent *)anEvent.nativeMsg;
-  // we can get synthetic events from the nsEventStateManager... these
-  // have no nativeMsg
-
-  if (pPluginEvent) {
-    PRBool eventHandled = PR_FALSE;
+  if (pPluginEvent) {
+    // XXXjgaunt
+    // Are we windowed? If so, pass the event on to the window
+    PRBool windowless = PR_FALSE;
+    mInstance->GetValue(nsPluginInstanceVariable_WindowlessBool,
+                        (void *)&windowless);
+
+    if (windowless) {
-    mInstance->HandleEvent(pPluginEvent, &eventHandled);
-    if (eventHandled)
-      rv = nsEventStatus_eConsumeNoDefault;
-  }
+    else {
+      // set this here, but it could happen earlier. Right now the only
+      //   case we need to set this is for certain types of embedding 
+      //   that need to translate mouse click locations from screen to
+      //   client coordinates.
+      // Default behavior would be to capture (PR_TRUE)
+      nsPluginWindowHelper helper;
+      if (anEvent.flags & NS_EVENT_FLAG_NO_MOUSE_CAPTURE) {
+        helper.SetMouseCapture(mPluginWindow, PR_FALSE);
+      }
+      else {
+        helper.SetMouseCapture(mPluginWindow, PR_TRUE);
+      }
+      // call the WinProc with the HWND and the event (message,wparam,lparam)
+      helper.LLSendEventToWindow(mPluginWindow, (void*) GetPluginPort(), (void*) pPluginEvent);
+      // XXXjgaunt - not sure if this is right, just following what was above
+      rv = nsEventStatus_eConsumeNoDefault;
+    }
+  }
-#endif
-
-  return rv;

layout/generic/nsObjectFrame.h

@@ -203 +203 @@
-                           nsHTMLReflowMetrics& aMetrics,
-                           const nsHTMLReflowState& aReflowState);
-
+  // called from Paint() to collect functionality that is used in
+  //   mulitple places for drastically different purposes: Printing;
+  //   and painting to a different DC than associated with a 
+  //   windowed plugin.
+  nsresult SetupPrinting(nsIRenderingContext& aRenderingContext,
+                         nsPresContext *aPresContext,
+                         nsPluginWindow &aPlugWin,
+                         nsPluginPrint  &aPlugPrint,
+                         nsIPluginInstance *&aPlugInstance);
+
-  friend class nsPluginInstanceOwner;
-private:
-  nsPluginInstanceOwner *mInstanceOwner;

modules/plugin/base/public/npapi.h

@@ -631 +631 @@
-#define NPVERS_68K_HAS_LIVECONNECT        11
-#define NPVERS_HAS_WINDOWLESS             11
-#define NPVERS_HAS_XPCONNECT_SCRIPTING    13
-
-
-
+
+
+
-#define NPVERS_HAS_RESPONSE_HEADERS       17
-
-/*----------------------------------------------------------------------*/

modules/plugin/base/public/nsPluginNativeWindow.h

@@ -106 +106 @@
-nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow);
-nsresult PLUG_DeletePluginNativeWindow(nsPluginNativeWindow * aPluginNativeWindow);
-
+/**
+ * Allows access to platform specific window implementations.
+ *
+ * Because the platform specific definitions are in the implementation files
+ *   it isn't possible to call them directly (and probably a good thing at that).
+ *   This class allows access to those classes without revealing the details of
+ *   implementation underneath.
+ */
+class nsPluginWindowHelper {
+public:
+  nsPluginWindowHelper() {}
+  virtual ~nsPluginWindowHelper() {}
+  /**
+   * The default behavior for mozilla's winowed plugins is to capture
+   *   the mouse input on a mouse down message and to release it on a mouse up.
+   *   this works fine if the input coordinates are in the right coordinate
+   *   system. But in some embedding cases it is necessary to translate the
+   *   actual screen coordinates that get passed in by the sytsem. This method
+   *   allows the embedding application to receive the mouse events first so as
+   *   to perform any coordinate translation that needs to happen.
+   *
+   * See the use of this in nsObjectFrame to see an example of it's use.
+   *
+   * @arg aNativeWindow - a pointer to the nsPluginNativeWindow(Win|Mac|Unix..)
+   *      for the plugin. If aMouseCapture is PR_FALSE, this window
+   *      will receive the mouse events.
+   *
+   * @arg aMouseCapture - PR_TRUE means mozilla will capture mouse events
+   *                      PR_FALSE means it won't.
+   */
+  nsresult SetMouseCapture(void *aNativeWindow, PRBool aMouseCapture);
+
+  /**
+   * This allows a message to be sent directly to the plugin's window. 
+   *
+   * @arg aNativeWindow - a pointer to the nsPluginNativeWindow(Win|Mac|Unix..)
+   *      for the plugin.
+   *
+   * @arg aPluginPort - a pointer to the platform dependant impl of the
+   *      nsPluginPort struct. On Windows this is a HWND. This is the handle
+   *      to the plugin's window that will recieve the message.
+   *
+   * @arg aNativeMessage - The native message for the platform. On windows
+   *      this is a nsPluginEvent pointer (event, wParam, lParam). This is
+   *      the message that will be sent to the plugin's window
+   */
+  nsresult LLSendEventToWindow(void *aNativeWindow, void *aPluginPort, void *aNativeMsg);
+};
+
-#endif //_nsPluginNativeWindow_h_

modules/plugin/base/src/nsPluginNativeWindowWin.cpp

@@ -140 +140 @@
-  nsIEventQueueService *GetEventService();
-  PluginWindowEvent * GetPluginWindowEvent(HWND aWnd, UINT aMsg, WPARAM aWParam, LPARAM aLParam);
-
+  // XXXjgaunt
+  void SetMouseCapture(PRBool aCapture) { mCanCaptureMouse = aCapture; }
+  PRBool CanCaptureMouse() { return mCanCaptureMouse; }
+  PRBool CanReleaseMouse() { return mMouseCaptured; }
+  void MouseCaptured() { mMouseCaptured = PR_TRUE; }
+  void MouseReleased() { mMouseCaptured = PR_FALSE; }
+
-private:
-  WNDPROC mPluginWinProc;
-  nsCOMPtr<nsIEventQueueService> mEventService;
-  PluginWindowEvent mPluginWindowEvent;
+  PRBool mCanCaptureMouse;
+  PRBool mMouseCaptured;
-
-public:
-  nsPluginType mPluginType;
-};
-
+// XXXjgaunt
+// class nsPluginWindowHelper
+nsresult nsPluginWindowHelper::SetMouseCapture(void *aNativeWindow, PRBool aMouseCapture) {
+  nsPluginNativeWindowWin *nativeWin = (nsPluginNativeWindowWin *) aNativeWindow;
+  if (nativeWin) {
+    nativeWin->SetMouseCapture(aMouseCapture);
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
+// on windows the incomimg pluginport is an HWND, nativemsg is (msg, wparam, lparam)
+nsresult nsPluginWindowHelper::LLSendEventToWindow(void *aNativeWindow, void *aPluginPort, void *aNativeMsg)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+  nsPluginNativeWindowWin *nativeWin = (nsPluginNativeWindowWin *) aNativeWindow;
+  if (nativeWin) {
+    nsPluginEvent *plugEvent = (nsPluginEvent *) aNativeMsg;
+    if (plugEvent) {
+      if (((nsPluginEvent *) aNativeMsg)->event == 0x0020) {  // the code for WM_SETCURSOR
+        // the wParam for SETCURSOR messages may be set to the parent window, not the plugin's window
+//        rv = PluginWndProc((HWND) aPluginPort, plugEvent->event, (PRUint32)aPluginPort, plugEvent->lParam);
+//        rv = SendMessage((HWND) aPluginPort, plugEvent->event, (PRUint32)aPluginPort, plugEvent->lParam);
+        rv = PostMessage((HWND) aPluginPort, plugEvent->event, (PRUint32)aPluginPort, plugEvent->lParam);
+      }
+      else {
+//        rv = PluginWndProc((HWND) aPluginPort, plugEvent->event, plugEvent->wParam, plugEvent->lParam);
+//        rv = SendMessage((HWND) aPluginPort, plugEvent->event, plugEvent->wParam, plugEvent->lParam);
+        rv = PostMessage((HWND) aPluginPort, plugEvent->event, plugEvent->wParam, plugEvent->lParam);
+      }
+    }
+  }
+  return rv;
+}
+
-static PRBool sInMessageDispatch = PR_FALSE;
-static UINT sLastMsg = 0;
-
@@ -208 +252 @@
-  if (!win)
-    return TRUE;
-
-
+
+
+
+
+
-  // Flash will need special treatment later
-  if (win->mPluginType == nsPluginType_Unknown) {
-    nsCOMPtr<nsIPluginInstance> inst;
@@ -259 +307 @@
-    case WM_RBUTTONDOWN: {
-      nsCOMPtr<nsIWidget> widget;
-      win->GetPluginWidget(getter_AddRefs(widget));
-)
+ && win->CanCaptureMouse()) {
-        widget->CaptureMouse(PR_TRUE);
+        win->MouseCaptured();
+      }
-      break;
-    }
-    case WM_LBUTTONUP:
@@ -271 +321 @@
-    case WM_RBUTTONUP: {
-      nsCOMPtr<nsIWidget> widget;
-      win->GetPluginWidget(getter_AddRefs(widget));
-)
+ && win->CanReleaseMouse()) {
-        widget->CaptureMouse(PR_FALSE);
+        win->MouseReleased();
+      }
-      break;
-    }
-    case WM_KEYDOWN:
@@ -377 +429 @@
-  mPluginWinProc = NULL;
-  mPluginWindowEvent.SetIsAlloced(PR_FALSE);
-  mPluginType = nsPluginType_Unknown;
+  mCanCaptureMouse = PR_TRUE;
+  mMouseCaptured = PR_FALSE;
-}
-
-nsPluginNativeWindowWin::~nsPluginNativeWindowWin()

view/src/nsViewManager.cpp

@@ -1875 +1875 @@
-    }
-
-    UpdateWidgetArea(widgetParent, nsRegion(damagedRect), nsnull);
+
-  } else {
-    // Propagate the update to the root widget of the root view manager, since
-    // iframes, for example, can overlap each other and be translucent.  So we
@@ -2012 +2013 @@
-            // Make sure to not send WillPaint notifications while scrolling
-            nsViewManager* rootVM = RootViewManager();
-
+
-            nsIWidget *widget = mRootView->GetWidget();
-            PRBool translucentWindow = PR_FALSE;
-            if (widget)
@@ -2429 +2431 @@
-  // Determine, for each view, whether it is or contains a ZPlaceholderView
-  ComputePlaceholderContainment(displayRoot);
-
-
-
-
-
-
-
-
+
+
-
-  {
-    nsHashtable       PlaceholderHash;
@@ -3571 +3568 @@
-  nsAutoVoidArray displayList;
-  PLArenaPool displayArena;
-  PL_INIT_ARENA_POOL(&displayArena, "displayArena", 1024);
+  // XXXjgaunt - Linden - fixes scrollbars, popups, iframes, framesets
-  BuildRenderingDisplayList(view, nsRegion(r), &displayList, displayArena,
-TRU
+FALS
-  RenderViews(view, *localcx, nsRegion(aRect), surface, displayList);
-  PL_FreeArenaPool(&displayArena);
-  PL_FinishArenaPool(&displayArena);
@@ -3710 +3708 @@
-                                        nsHashtable &aMapPlaceholderViewToZTreeNode,
-                                        PLArenaPool &aPool)
-{
+  // XXXjgaunt - Linden - always paint floats
+  aPaintFloats = PR_TRUE;
-  PRBool retval = PR_FALSE;
-
-  aResult = nsnull;

widget/public/nsGUIEvent.h

@@ -118 +118 @@
-#define NS_EVENT_FLAG_SYSTEM_EVENT        0x0200
-#define NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY 0x0400 // @see nsIDOM3Event::stopImmediatePropagation()
-#define NS_EVENT_FLAG_DISPATCHING         0x0800
+#define NS_EVENT_FLAG_NO_MOUSE_CAPTURE    0x1000       // XXXjgaunt
-
-#define NS_PRIV_EVENT_UNTRUSTED_PERMITTED 0x8000
-

widget/public/nsIToolkit.idl

@@ -43 +43 @@
-#include "prthread.h"
-%}
-
+interface nsIWidget;
+
-[ptr] native PRThread(PRThread);
-
+[uuid(792dc3f5-adc0-4ef7-a07d-e0fd9be8cc9f)]
+interface nsIToolkitObserver : nsISupports
+{
+  /**
+   * Called after a native widget has been invalidated, either manually
+   * via nsIWidget::Invalidate or due to a widget being moved, shown or
+   * resized. We pass the coordinates of the rectangle that bounds the
+   * area that has been invalidated, relative to the origin of nsIWidget
+   * in pixels.
+   */
+  void notifyInvalidated(in nsIWidget aWidget, in long x, in long y, in long width, in long height);
+};
-
-[uuid(18032BD0-B265-11d1-AA2A-000000000000)]
-interface nsIToolkit : nsISupports
@@ -58 +72 @@
-   */
-  void Init(in PRThread aThread);
-
+  void addObserver(in nsIToolkitObserver aObserver);
+  void removeObserver(in nsIToolkitObserver aObserver);
-};
-
-

widget/public/nsITransferable.idl

@@ -57 +57 @@
-
-#define kURLMime                    "text/x-moz-url"        // data contains url\ntitle
-#define kURLDataMime                "text/x-moz-url-data"   // data contains url only
-
+
-#define kURLPrivateMime             "text/x-moz-url-priv"   // same as kURLDataMime but for private uses
-#define kNativeImageMime            "application/x-moz-nativeimage"
-#define kNativeHTMLMime             "application/x-moz-nativehtml"

widget/src/gtk2/nsAppShell.h

@@ -43 +43 @@
-#include "nsIEventQueue.h"
-#include "nsCOMPtr.h"
-
+class nsIToolkit;
+
-class nsAppShell : public nsIAppShell {
-public:
-

widget/src/gtk2/nsToolkit.cpp

@@ -107 +107 @@
-    return NS_OK;
-}
-
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+NS_IMETHODIMP
+nsToolkit::AddObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! mObservers.AppendObject(aObserver)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsToolkit::RemoveObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    mObservers.RemoveObject(aObserver);
+
+    return NS_OK;
+
+}
+
+void nsToolkit::NotifyInvalidated(nsIWidget* aWidget, int x, int y, int width, int height)
+{
+    PRInt32 count = mObservers.Count();
+    for (PRInt32 i = 0; i < count; ++i)
+        {
+            (void) mObservers[i]->NotifyInvalidated(aWidget, x, y, width, height);
+        }
+}
-
-//-------------------------------------------------------------------------
-//

widget/src/gtk2/nsToolkit.h

@@ -41 +41 @@
-#define TOOLKIT_H
-
-#include "nsIToolkit.h"
+#include "nsCOMArray.h"
-#include <gtk/gtk.h>
-
-/**
@@ -62 +63 @@
-    void          CreateSharedGC(void);
-    GdkGC         *GetSharedGC(void);
-
+    NS_IMETHOD      AddObserver(nsIToolkitObserver* aObserver);
+    NS_IMETHOD      RemoveObserver(nsIToolkitObserver* aObserver);
+
+    void            NotifyInvalidated(nsIWidget* aWidget, int x, int y,
+                                      int width, int height);
+
-private:
-    GdkGC         *mSharedGC;
+    nsCOMArray<nsIToolkitObserver> mObservers;
-};
-
-

widget/src/gtk2/nsWindow.cpp

@@ -322 +322 @@
-        mLastDragMotionWindow = NULL;
-    }
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    delete[] mTransparencyBitmap;
-    mTransparencyBitmap = nsnull;
-
@@ -467 +469 @@
-
-    if (!mShell && mDrawingarea) {
-        moz_drawingarea_reparent(mDrawingarea, newParentWindow);
+        NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-    } else {
-        NS_NOTREACHED("nsWindow::SetParent - reparenting a non-child window");
-    }
@@ -575 +578 @@
-        moz_drawingarea_move(mDrawingarea, aX, aY);
-    }
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    return NS_OK;
-}
-
@@ -614 +619 @@
-                gdk_window_lower(w->mDrawingarea->clip_window);
-        }
-    }
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    return NS_OK;
-}
-
@@ -651 +659 @@
-
-    mSizeState = mSizeMode;
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    return rv;
-}
-
@@ -1003 +1013 @@
-NS_IMETHODIMP
-nsWindow::Validate()
-{
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    // Get the update for this window and, well, just drop it on the
-    // floor.
-
- 
+ 
+
-
-    GdkRegion *region = gdk_window_get_update_area(mDrawingarea->inner_window);
-
@@ -1021 +1033 @@
-{
-    GdkRectangle rect;
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    rect.x = mBounds.x;
-    rect.y = mBounds.y;
-    rect.width = mBounds.width;
@@ -1054 +1068 @@
-    LOGDRAW(("Invalidate (rect) [%p]: %d %d %d %d (sync: %d)\n", (void *)this,
-             rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
-
+    NotifyInvalidated(aRect);
+
-    if (!mDrawingarea)
-        return NS_OK;
-
@@ -1062 +1078 @@
-    if (aIsSynchronous)
-        gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-
+    NotifyInvalidated(aRect);
+
-    return NS_OK;
-}
-
@@ -1082 +1100 @@
-
-        gdk_window_invalidate_region(mDrawingarea->inner_window,
-                                     region, FALSE);
+
+        NotifyInvalidated(nsRect(rect.x, rect.y, rect.width, rect.height));
-    }
-    else {
-        LOGDRAW(("Invalidate (region) [%p] with empty region\n",
@@ -1094 +1114 @@
-NS_IMETHODIMP
-nsWindow::Update()
-{
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    if (!mDrawingarea)
-        return NS_OK;
-
-    gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-    return NS_OK;
-}
-
@@ -1112 +1135 @@
-                 PRInt32  aDy,
-                 nsRect  *aClipRect)
-{
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    if (!mDrawingarea)
-        return NS_OK;
-
@@ -1128 +1153 @@
-
-    // Process all updates so that everything is drawn.
-    gdk_window_process_all_updates();
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    return NS_OK;
-}
-
@@ -1135 +1163 @@
-nsWindow::ScrollWidgets(PRInt32 aDx,
-                        PRInt32 aDy)
-{
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    if (!mDrawingarea)
-        return NS_OK;
-
-    moz_drawingarea_scroll(mDrawingarea, aDx, aDy);
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    return NS_OK;
-}
-
@@ -1465 +1498 @@
-    DispatchEvent(&event, status);
-
-    g_free(rects);
+ 
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-
-    // check the return value!
-    return TRUE;
@@ -1513 +1548 @@
-         (void *)this, aAllocation->x, aAllocation->y,
-         aAllocation->width, aAllocation->height));
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    nsRect rect(aAllocation->x, aAllocation->y,
-                aAllocation->width, aAllocation->height);
-
@@ -1528 +1565 @@
-
-    nsEventStatus status;
-    DispatchResizeEvent (rect, status);
+ 
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-}
-
-void
@@ -2394 +2433 @@
-                       nsIToolkit       *aToolkit,
-                       nsWidgetInitData *aInitData)
-{
+    //    mToolkit = aToolkit;
+
-    // only set the base parent if we're going to be a dialog or a
-    // toplevel
-    nsIWidget *baseParent = aInitData &&
@@ -2726 +2767 @@
-    LOG(("nsWindow::NativeResize [%p] %d %d\n", (void *)this,
-         aWidth, aHeight));
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    ResizeTransparencyBitmap(aWidth, aHeight);
-
-    // clear our resize flag
@@ -2751 +2794 @@
-                       PRInt32 aWidth, PRInt32 aHeight,
-                       PRBool  aRepaint)
-{
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    mNeedsResize = PR_FALSE;
-    mNeedsMove = PR_FALSE;
-
@@ -2793 +2838 @@
-    else if (mDrawingarea) {
-        moz_drawingarea_move_resize(mDrawingarea, aX, aY, aWidth, aHeight);
-    }
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-}
-
-void
@@ -2840 +2887 @@
-            moz_drawingarea_set_visibility(mDrawingarea, FALSE);
-        }
-    }
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-}
-
-void
@@ -3015 +3064 @@
-
-    gtk_widget_shape_combine_mask(mShell, maskBitmap, 0, 0);
-    gdk_bitmap_unref(maskBitmap);
+
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-}
-
-NS_IMETHODIMP

widget/src/gtk2/nsWindow.h

@@ -39 +39 @@
-#ifndef __nsWindow_h__
-
-#include "nsCommonWidget.h"
+#include "nsToolkit.h"
-
-#include "mozcontainer.h"
-#include "mozdrawingarea.h"
@@ -286 +287 @@
-   NS_IMETHOD          UpdateTranslucentWindowAlpha(const nsRect& aRect, PRUint8* aAlphas);
-#endif
-
+protected:
+    void NotifyInvalidated(const nsRect& aRect) {
+        nsToolkit* tk = NS_STATIC_CAST(nsToolkit*, mToolkit);
+        if (tk) {
+            tk->NotifyInvalidated(this, aRect.x, aRect.y, aRect.width, aRect.height);
+        }
+    }
+
+   
-private:
-    void               GetToplevelWidget(GtkWidget **aWidget);
-    void               GetContainerWindow(nsWindow  **aWindow);

widget/src/mac/nsToolkitBase.cpp

@@ -243 +243 @@
-  }
-}
-
+NS_IMETHODIMP
+nsToolkitBase::AddObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! mObservers.AppendObject(aObserver)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsToolkitBase::RemoveObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    mObservers.RemoveObject(aObserver);
+
+    return NS_OK;
+
+}
+
+void nsToolkitBase::NotifyInvalidated(nsIWidget* aWidget, int x, int y, int width, int height)
+{
+        PRInt32 count = mObservers.Count();
+        for (PRInt32 i = 0; i < count; ++i)
+        {
+                (void) mObservers[i]->NotifyInvalidated(aWidget, x, y, width, height);
+        }
+
+        //if (mObserver)
+        //      mObserver->NotifyInvalidated(aWidget, x, y, width, height);
+
+   
+}
+
+
-
-#pragma mark -
-

widget/src/mac/nsToolkitBase.h

@@ -43 +43 @@
-#include "nsIToolkit.h"
-
-#include "nsCOMPtr.h"
+#include "nsCOMArray.h"
-#include "nsIEventQueueService.h"
-
-
@@ -57 +58 @@
-  
-  static void       PostSleepWakeNotification(const char* aNotification);
-
+         void       NotifyInvalidated(nsIWidget* aWidget, int x, int y, int width, int height);
+
-protected:
-
-  virtual nsresult  InitEventQueue(PRThread * aThread) = 0;
@@ -76 +79 @@
-
-  CFRunLoopSourceRef   mSleepWakeNotificationRLS;
-  io_object_t       mPowerNotifier;
+    //nsCOMPtr<nsIToolkitObserver> mObserver;
+    nsCOMArray<nsIToolkitObserver> mObservers;
-};
-
-extern nsToolkitBase* NS_CreateToolkitInstance();

widget/src/mac/nsWindow.cpp

@@ -292 +292 @@
-
-        mDestructorCalled = PR_TRUE;
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-        //Destroy();
-
-        if (mWindowRegion)
@@ -423 +425 @@
-        NS_IF_RELEASE(mMenuBar);
-        SetMenuBar(nsnull);
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-        ReportDestroyEvent();   // beard: this seems to cause the window to be deleted. moved all release code to destructor.
-
-        return NS_OK;
@@ -533 +537 @@
-NS_IMETHODIMP nsWindow::Show(PRBool bState)
-{
-  mVisible = bState;
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  return NS_OK;
-}
-
@@ -878 +883 @@
-{
-        if ((mBounds.x != aX) || (mBounds.y != aY))
-        {
+                NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-                // Invalidate the current location (unless it's the top-level window)
-                if ((mParent != nsnull) && (!mIsTopWidgetWindow))
-                        Invalidate(PR_FALSE);
@@ -891 +898 @@
-
-                // Report the event
-                ReportMoveEvent();
+
+                NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-        }
-        return NS_OK;
-}
@@ -902 +911 @@
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
-{
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  if ((mBounds.width != aWidth) || (mBounds.height != aHeight))
-  {
+
-    // Set the bounds
-    mBounds.width  = aWidth;
-    mBounds.height = aHeight;
@@ -917 +929 @@
-
-    // Report the event
-    ReportSizeEvent();
+
+        NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  }
-  else {
-    // Recalculate the regions. We always need to do this, our parents may have
@@ -927 +941 @@
-      Invalidate(PR_FALSE);
-  }
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  return NS_OK;
-}
-
@@ -1051 +1067 @@
-        if ( aIsSynchronous )
-          Update();
-
+        NotifyInvalidated(aRect);
+
-        return NS_OK;
-}
-
@@ -1091 +1109 @@
-        if ( aIsSynchronous )
-          Update();
-
+    PRInt32 x, y, width, height;
+    NS_CONST_CAST(nsIRegion*, aRegion)->GetBoundingBox(&x, &y, &width, &height);
+    NotifyInvalidated(nsRect(x, y, width, height));
+
-        return NS_OK;
-}
-
@@ -1469 +1491 @@
-
-  NS_ASSERTION(ValidateDrawingState(), "Bad drawing state");
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  return NS_OK;
-}
-
@@ -1702 +1726 @@
-      ScrollBits(macRect,aDx,aDy);
-
-      EndDraw();
+          
+          NotifyInvalidated(scrollRect);
-    }
-  }
-

widget/src/mac/nsWindow.h

@@ -41 +41 @@
-#include "nsIPluginWidget.h"
-#include "nsBaseWidget.h"
-#include "nsDeleteObserver.h"
+#include "nsToolkit.h"
-
-#include "nsIWidget.h"
-#include "nsIKBStateControl.h"
@@ -238 +239 @@
-  void          CombineRects ( TRectArray & inRectArray ) ;
-  void          SortRectsLeftToRight ( TRectArray & inRectArray ) ;
-
+  void NotifyInvalidated(const nsRect& aRect) {
+        nsToolkit* tk = NS_STATIC_CAST(nsToolkit*, mToolkit);
+        if (tk) {
+          tk->NotifyInvalidated(this, aRect.x, aRect.y, aRect.width, aRect.height);
+    }
+  }
+
-protected:
-#if DEBUG
-  const char*       gInstanceClassName;

widget/src/windows/nsToolkit.cpp

@@ -734 +734 @@
-  return nsnull;
-}
-
+NS_IMETHODIMP
+nsToolkit::AddObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! mObservers.AppendObject(aObserver)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsToolkit::RemoveObserver(nsIToolkitObserver* aObserver)
+{
+    if (! aObserver)
+        return NS_ERROR_NULL_POINTER;
+
+    mObservers.RemoveObject(aObserver);
+
+    return NS_OK;
+
+}
+
+void nsToolkit::NotifyInvalidated(nsIWidget* aWidget, int x, int y, int width, int height)
+{
+        PRInt32 count = mObservers.Count();
+        for (PRInt32 i = 0; i < count; ++i)
+        {
+                (void) mObservers[i]->NotifyInvalidated(aWidget, x, y, width, height);
+        }
+
+        //if (mObserver)
+        //      mObserver->NotifyInvalidated(aWidget, x, y, width, height);
+
+   
+}
+
-//-------------------------------------------------------------------------
-//
-// Register the window class for the internal window and create the window

widget/src/windows/nsToolkit.h

@@ -46 +46 @@
-#include "nsWindowAPI.h"
-#include "nsITimer.h"
-#include "nsCOMPtr.h"
+#include "nsCOMArray.h"
+
+#include <stdio.h>
-
-struct MethodInfo;
-class nsIEventQueue;
@@ -84 +87 @@
-            PRBool          UserIsMovingWindow(void);
-            nsIEventQueue*  GetEventQueue(void);
-
+            NS_IMETHOD      AddObserver(nsIToolkitObserver* aObserver);
+            NS_IMETHOD      RemoveObserver(nsIToolkitObserver* aObserver);
+
-private:
-                            ~nsToolkit();
-            void            CreateUIThread(void);
-
-public:
+            void            NotifyInvalidated(nsIWidget* aWidget, int x, int y, int width, int height);
+
-    // Window procedure for the internal window
-    static LRESULT CALLBACK WindowProc(HWND hWnd, 
-                                        UINT Msg, 
@@ -100 +108 @@
-    HWND        mDispatchWnd;
-    // Thread Id of the "main" Gui thread.
-    PRThread    *mGuiThread;
+    //nsCOMPtr<nsIToolkitObserver> mObserver;
+    nsCOMArray<nsIToolkitObserver> mObservers;
-
-public:
-    static HINSTANCE mDllInstance;

widget/src/windows/nsWindow.cpp

@@ -1832 +1832 @@
-    }
-#endif
-
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-    VERIFY(::DestroyWindow(mWnd));
-
-    mWnd = NULL;
@@ -1849 +1851 @@
-
-NS_IMETHODIMP nsWindow::SetParent(nsIWidget *aNewParent)
-{
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  if (aNewParent) {
-    HWND newParent = (HWND)aNewParent->GetNativeData(NS_NATIVE_WINDOW);
-    NS_ASSERTION(newParent, "Parent widget has a null native window handle");
-    ::SetParent(mWnd, newParent);
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-
-    return NS_OK;
-  }
@@ -2009 +2013 @@
-                       SWP_NOZORDER | SWP_NOACTIVATE);
-      }
-    }
+    NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  }
-  mIsVisible = bState;
-
@@ -2056 +2061 @@
-  }
-
-  ::SetWindowPos(mWnd, behind, 0, 0, 0, 0, flags);
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  return NS_OK;
-}
-
@@ -2268 +2274 @@
-    return NS_OK;
-  }
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  mBounds.x = aX;
-  mBounds.y = aY;
-
@@ -2310 +2318 @@
-
-    NS_IF_RELEASE(par);
-  }
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  return NS_OK;
-}
-
@@ -2328 +2337 @@
-    ResizeTranslucentWindow(aWidth, aHeight);
-#endif
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  // Set cached value for lightweight and printing
-  mBounds.width  = aWidth;
-  mBounds.height = aHeight;
@@ -2358 +2368 @@
-    NS_IF_RELEASE(par);
-  }
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  if (aRepaint)
-    Invalidate(PR_FALSE);
-
@@ -2380 +2392 @@
-    ResizeTranslucentWindow(aWidth, aHeight);
-#endif
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  // Set cached value for lightweight and printing
-  mBounds.x      = aX;
-  mBounds.y      = aY;
@@ -2411 +2425 @@
-    NS_IF_RELEASE(par);
-  }
-
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
+
-  if (aRepaint)
-    Invalidate(PR_FALSE);
-
@@ -3234 +3250 @@
-        VERIFY(::UpdateWindow(mWnd));
-      }
-    }
+
+    NotifyInvalidated(nsRect(nsPoint(0,0), mBounds.Size()));
-  }
-  return NS_OK;
-}
@@ -3274 +3292 @@
-        VERIFY(::UpdateWindow(mWnd));
-      }
-    }
+
+    NotifyInvalidated(aRect);
-  }
-  return NS_OK;
-}
@@ -3303 +3323 @@
-        rv = NS_ERROR_FAILURE;
-      }
-    }
+
+    PRInt32 x, y, width, height;
+    NS_CONST_CAST(nsIRegion*, aRegion)->GetBoundingBox(&x, &y, &width, &height);
+    NotifyInvalidated(nsRect(x, y, width, height));
-  }
-  return rv;
-}
@@ -3444 +3468 @@
-
-  ::ScrollWindowEx(mWnd, aDx, aDy, (nsnull != aClipRect) ? &trect : NULL, NULL,
-                   NULL, NULL, SW_INVALIDATE | SW_SCROLLCHILDREN);
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  ::UpdateWindow(mWnd);
-  return NS_OK;
-}
@@ -3453 +3478 @@
-  // Scroll the entire contents of the window + change the offset of any child windows
-  ::ScrollWindowEx(mWnd, aDx, aDy, NULL, NULL, NULL,
-                   NULL, SW_INVALIDATE | SW_SCROLLCHILDREN);
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  ::UpdateWindow(mWnd); // Force synchronous generation of NS_PAINT
-  return NS_OK;
-}
@@ -3470 +3496 @@
-  // Child windows are not scrolled.
-  ::ScrollWindowEx(mWnd, aDx, aDy, &trect, NULL, NULL,
-                   NULL, SW_INVALIDATE);
+  NotifyInvalidated(nsRect(nsPoint(0, 0), mBounds.Size()));
-  ::UpdateWindow(mWnd); // Force synchronous generation of NS_PAINT
-  return NS_OK;
-}
@@ -8270 +8297 @@
-      // Rollup if the event is outside the popup.
-      PRBool rollup = !nsWindow::EventIsInsideWindow(inMsg, (nsWindow*)gRollupWidget);
-
+      // XXXjgaunt - Linden - to get events to the popup
+      rollup = PR_FALSE;
+
-      if (rollup && (inMsg == WM_MOUSEWHEEL || inMsg == uMSH_MOUSEWHEEL ||
-                     inMsg == WM_MOUSEHWHEEL))
-      {

widget/src/windows/nsWindow.h

@@ -526 +526 @@
-
-  PRBool CanTakeFocus();
-
+  void NotifyInvalidated(const nsRect& aRect) {
+        nsToolkit* tk = NS_STATIC_CAST(nsToolkit*, mToolkit);
+        if (tk) {
+          tk->NotifyInvalidated(this, aRect.x, aRect.y, aRect.width, aRect.height);
+    }
+  }
+
-private:
-
-

xulrunner/installer/mac/Makefile.in

@@ -79 +79 @@
-
-# Syntax "chown_root <directory>"
-# Should be equivalent to "chown -R root:admin <directory>"
-
+
+
-
-# Syntax "chown_revert <directory>"
-# Should be equivalent to "chown -R <getuid> <directory>"
-
+
+
-
-# Do the real work here: we take $(DIST)/XUL.framework and make it into an
-# installer .pkg bundle. The xulrunner/installer makefile will then pack the
@@ -94 +96 @@
-        $(RM) -rf $(DIST)/$(STAGEPATH)xulrunner-pkg
-        mkdir $(DIST)/$(STAGEPATH)xulrunner-pkg
-        chmod -R a+rX,u+w,go-w,-s,-t $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)
+# MBW -- XXX -- turning this off, since it breaks us.
+# create the package directory at least, so rsync doesn't die.
+        mkdir -p $(_ABS_DIST)/$(STAGEPATH)xulrunner-pkg/$(PKG_BASENAME).pkg/Contents/MacOS
-# For some unknown reason, PackageMaker requires absolute paths to everything.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#

widget/src/mac/nsMacTSMMessagePump.cpp

@@ -172 +172 @@
-        NS_ASSERTION(err==noErr, "nsMacTSMMessagePump::PositionToOffsetHandler: AEGetParamPtr[TSMRefcon] failed");
-        if (err!=noErr) 
-                return err;
+
+        if(NULL==eventHandler)
+                return errAEEventNotHandled;
-        
-        //
-        // Extract the Position parameter.
@@ -220 +223 @@
-        NS_ASSERTION(err==noErr, "nsMacTSMMessagePump::OffsetToPositionHandler: AEGetParamPtr[TSMRefcon] failed.");
-        if (err!=noErr) 
-                return err;
+
+        if(NULL==eventHandler)
+                return errAEEventNotHandled;
-        
-        //
-        // Extract the Offset parameter
@@ -264 +270 @@
-  NS_ASSERTION(err==noErr, "nsMacTSMMessagePump::GetAppleEventTSMData: AEGetParamPtr[TSMRefcon] failed.");
-  if (err)
-    return err;
+
+  if(NULL==*outEventHandler)
+    return errAEEventNotHandled;
- 
-  //
-  // get text
@@ -438 +447 @@
-  NS_ASSERTION(err==noErr, "nsMacTSMMessagePump::UnicodeGetSelectedTextHandler: AEGetParamPtr[TSMRefcon] failed.");
-  if (err!=noErr) 
-    return err;
+
+  if(NULL==eventHandler)
+    return errAEEventNotHandled;
-  
-  //
-  // Extract the Offset parameter

modules/plugin/base/src/nsPluginsDirDarwin.cpp

@@ -260 +260 @@
-static char* p2cstrdup(StringPtr pstr)
-{
-    int len = pstr[0];
-new char[len + 1]
+(char*)PR_Malloc((len + 1) * sizeof(char))
-    if (cstr != NULL) {
-        ::BlockMoveData(pstr + 1, cstr, len);
-        cstr[len] = '\0';
@@ -373 +373 @@
-
-      // fill-in rest of info struct
-      int variantCount = info.fVariantCount;
-new char*[variantCount]
-new char*[variantCount]
+(char **)PR_Malloc(variantCount * sizeof(char *))
+(char **)PR_Malloc(variantCount * sizeof(char *))
-      if (mi.infoStrings)
-new char*[variantCount]
+(char **)PR_Malloc(variantCount * sizeof(char *))
-
-      short mimeIndex = 2, descriptionIndex = 2;
-            for (int i = 0; i < variantCount; i++) {
@@ -403 +403 @@
-{
-    if (info.fPluginInfoSize <= sizeof(nsPluginInfo)) 
-        {
-
-
+
+
+
-            int variantCount = info.fVariantCount;
-            for (int i = 0; i < variantCount; i++) 
-                {
-delete[] info.fMimeTypeArray[i]
-delete[] info.fExtensionArray[i]
-delete[] info.fMimeDescriptionArray[i]
+PR_Free(info.fMimeTypeArray[i])
+PR_Free(info.fExtensionArray[i])
+PR_Free(info.fMimeDescriptionArray[i])
-                }
-delete[] info.fMimeTypeArray
-delete[] info.fMimeDescriptionArray
-delete[] info.fExtensionArray
-delete[] info.fFileName
-delete[] info.fFullPath
+PR_Free(info.fMimeTypeArray)
+PR_Free(info.fMimeDescriptionArray)
+PR_Free(info.fExtensionArray)
+PR_Free(info.fFileName)
+PL_strfree(info.fFullPath)
-        }
-    return NS_OK;
-}