author Doug Thayer <dothayer@mozilla.com>
Fri, 01 Mar 2019 18:29:09 +0000
changeset 520116 8b3fe0426ffc1b3a2ad044ef6cdde6c4f736f8e2
parent 511623 5f4630838d46dd81dadb13220a4af0da9e23a619
permissions -rw-r--r--
Bug 1442694 - Fix failures due to removing selected tab r=Gijs This adds test which reproduce the failure as well as the fix. Essentially, if we hit the edited case in SessionStore with `tab` equal to `tabbrowser.tabs[t]`, we remove the tab and then try to pin it, which obviously blows up. Note: the additional method in SessionStore.jsm was largely to get around complexity requirements inside restoreWindow. Cleaner solutions welcome. Differential Revision: https://phabricator.services.mozilla.com/D21383

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#ifndef __mozilla_widget_nsShmImage_h__
#define __mozilla_widget_nsShmImage_h__

#if defined(MOZ_X11)


#  include "mozilla/gfx/2D.h"
#  include "nsIWidget.h"
#  include "Units.h"

#  include <X11/Xlib-xcb.h>
#  include <xcb/shm.h>

class nsShmImage {
  // bug 1168843, compositor thread may create shared memory instances that are
  // destroyed by main thread on shutdown, so this must use thread-safe RC to
  // avoid hitting assertion

  static bool UseShm();

  already_AddRefed<mozilla::gfx::DrawTarget> CreateDrawTarget(
      const mozilla::LayoutDeviceIntRegion& aRegion);

  void Put(const mozilla::LayoutDeviceIntRegion& aRegion);

  nsShmImage(Display* aDisplay, Drawable aWindow, Visual* aVisual,
             unsigned int aDepth);


  bool InitExtension();

  bool CreateShmSegment();
  void DestroyShmSegment();

  bool CreateImage(const mozilla::gfx::IntSize& aSize);
  void DestroyImage();

  void WaitIfPendingReply();

  Display* mDisplay;
  xcb_connection_t* mConnection;
  Window mWindow;
  Visual* mVisual;
  unsigned int mDepth;

  mozilla::gfx::SurfaceFormat mFormat;
  mozilla::gfx::IntSize mSize;
  int mStride;

  xcb_pixmap_t mPixmap;
  xcb_gcontext_t mGC;
  xcb_get_input_focus_cookie_t mSyncRequest;
  bool mRequestPending;

  xcb_shm_seg_t mShmSeg;
  int mShmId;
  uint8_t* mShmAddr;