Bug 1094141 - Don't export skia APIs from xul.dll. r=glandium
Bug 1084370 - Fix handling of vertical-align in lines with vertical writing mode. r=smontagu
Bug 1094434 - Render resizer appropriately for vertical-lr and vertical-rl writing modes. r=roc
Bug 1094434 - Reftests for display of resizer on vertical-lr and vertical-rl textareas. r=roc
(no bug) Update count of GC reasons in comment DONTBUILD
Bug 1021367 - Assertion failure in GetShaderConfigFor. r=nical
Bug 1076163 - Basic APZ support for css-driven resolution. r=kats,tn

This makes APZ behave nicely with most uses of a css transform:scale.

Summary of changes:
  - FrameMetrics::mCumulativeResolution now includes the css-driven resolution
    in addition to the pres-shell resolution.
  - Displayports are now stored in Screen pixels rather than Layer pixels.
    This is what we want anyways (as we'd like the displayport size to remain
    constant as a fraction of the screen size), but it was necessary to make
    this change as part of this patch because continuing to store them in
    Layer pixels in the presence of a css-driven resolution would have
    required a bunch of infrastructure to implement correctly.

Remaining work:
  - Layout painting a scrollable layer at a resolution different from the
    scale induced by the css transform causes problems. These will go away
    with bug 1076192.
  - Different resolutions on the x and y axes are not supported. This is
    tracked by bug 1039967.
Bug 1076163 - Clean up the resolution-related fields and methods in FrameMetrics. r=kats
Bug 1055741 - Unify the 'local Screen' and 'ParentLayer' coordinate systems. r=kats
Backed out changeset 13ba124946bd (bug 1074378) for causing bug 1081171.
Bug 1097861 - make CycleCollectionNoteChild more easily forward-declarable; r=mccr8

Forward declaring functions with default arguments is difficult.  If you try to say:

template<typename T>
inline void
CycleCollectionNoteChild(nsCycleCollectionTraversalCallback& aCallback,
                         T* aChild, const char* aName, uint32_t aFlags);

and then later have:

template<typename T>
inline void
CycleCollectionNoteChild(nsCycleCollectionTraversalCallback& aCallback,
                         T* aChild, const char* aName, uint32_t aFlags = 0);
{
  ...
}

the compiler complains that default arguments cannot be added to a
function template that has already been declared.  If you attempt to
mollify the compiler by declaring instead:

template<typename T>
inline void
CycleCollectionNoteChild(nsCycleCollectionTraversalCallback& aCallback,
                         T* aChild, const char* aName, uint32_t aFlags = 0);

the compiler then complains about redefining the default argument (!)
when an actual definition is found.

To circumvent this, manually implement "default" arguments by providing
a three-argument form of CycleCollectionNoteChild, which simply forwards
to the four-argument version.
Bug 1095541 - part 1 - move nsRefPtr nsCOMPtr_helper overloads out-of-line; r=bsmedberg

Doing this means that instantiations of nsRefPtr<T> won't require
nsCOMPtr_helper::operator() to be defined.  Only actual uses of the
overloads will require the definition.
Bug 1095541 - part 2 - move already_AddRefed to its own header file; r=bsmedberg
Bug 1095541 - part 3 - remove nsCOMPtr.h #include from nsRefPtr.h; r=bsmedberg
Bug 1091912 - stop using mprotect to halt Ion/asm.js execution (r=bhackett)

--HG--
extra : rebase_source : 3642ce948e577bca54008d3c55206184b107d023
Bug 1098070 - Remove trailing whitespace from nsCCUncollectableMarker.cpp. r=smaug
Bug 868139 - Don't redo unmarking work in nsGlobalWindow::CanSkip if we already did it. r=smaug

This causes quadratic behavior in forgetSkippable when there are many timeouts.

To avoid this, we mark the CC generation of the last time we ran CanSkip on the window,
and don't do it again if it hasn't changed.
Bug 1018397 - Start an ICC timer even if ICC is globally disabled. r=smaug
Merge mozilla-central to mozilla-inbound
Bug 1097890 - Inline JSOP_NEWOBJECT in Baseline. r=bhackett