Merge autoland to mozilla-central. a=merge
authorAndreea Pavel <apavel@mozilla.com>
Fri, 10 May 2019 12:49:31 +0300
changeset 473349 d9d0399a6baf2f0677586b79f3195d39b2119f97
parent 473348 5d2aa419a72c9078f3c82d21da7638d9ce8f2006 (current diff)
parent 473347 7c1fce459b7aa1c21e92331ce7ddbf05a7a49f58 (diff)
child 473350 15583c97669a526418146062c36729ccb90c5609
child 473389 aa7e1ffb96b957caa99207ebcb4052049af3703c
push id113073
push userapavel@mozilla.com
push dateFri, 10 May 2019 10:12:05 +0000
treeherdermozilla-inbound@15583c97669a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.0a1
first release with
nightly linux32
d9d0399a6baf / 68.0a1 / 20190510095015 / files
nightly linux64
d9d0399a6baf / 68.0a1 / 20190510095015 / files
nightly mac
d9d0399a6baf / 68.0a1 / 20190510095015 / files
nightly win32
d9d0399a6baf / 68.0a1 / 20190510095015 / files
nightly win64
d9d0399a6baf / 68.0a1 / 20190510095015 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge autoland to mozilla-central. a=merge
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -11046,17 +11046,17 @@ static void DispatchPointerLockError(Doc
 class PointerLockRequest final : public Runnable {
  public:
   PointerLockRequest(Element* aElement, bool aUserInputOrChromeCaller)
       : mozilla::Runnable("PointerLockRequest"),
         mElement(do_GetWeakReference(aElement)),
         mDocument(do_GetWeakReference(aElement->OwnerDoc())),
         mUserInputOrChromeCaller(aUserInputOrChromeCaller) {}
 
-  NS_IMETHOD Run() final;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHOD Run() final;
 
  private:
   nsWeakPtr mElement;
   nsWeakPtr mDocument;
   bool mUserInputOrChromeCaller;
 };
 
 static const char* GetPointerLockError(Element* aElement, Element* aCurrentLock,
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
@@ -1935,18 +1935,19 @@ class Document : public nsINode,
   /**
    * Handles any pending fullscreen in aDocument or its subdocuments.
    *
    * Returns whether there is any fullscreen request handled.
    */
   static bool HandlePendingFullscreenRequests(Document* aDocument);
 
   void RequestPointerLock(Element* aElement, CallerType);
-  bool SetPointerLock(Element* aElement, StyleCursorKind);
-
+  MOZ_CAN_RUN_SCRIPT bool SetPointerLock(Element* aElement, StyleCursorKind);
+
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   static void UnlockPointer(Document* aDoc = nullptr);
 
   // ScreenOrientation related APIs
 
   void SetCurrentOrientation(OrientationType aType, uint16_t aAngle) {
     mCurrentOrientationType = aType;
     mCurrentOrientationAngle = aAngle;
   }
--- a/dom/base/nsGlobalWindowOuter.h
+++ b/dom/base/nsGlobalWindowOuter.h
@@ -320,17 +320,17 @@ class nsGlobalWindowOuter final : public
   void DispatchDOMWindowCreated();
 
   virtual void SetOpenerWindow(nsPIDOMWindowOuter* aOpener,
                                bool aOriginalOpener) override;
 
   // Outer windows only.
   virtual void EnsureSizeAndPositionUpToDate() override;
 
-  virtual void EnterModalState() override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual void EnterModalState() override;
   virtual void LeaveModalState() override;
 
   // Outer windows only.
   virtual bool CanClose() override;
   virtual void ForceClose() override;
 
   // Outer windows only.
   virtual bool DispatchCustomEvent(const nsAString& aEventName) override;
@@ -858,16 +858,17 @@ class nsGlobalWindowOuter final : public
   nsresult SetDocShellWidthAndHeight(int32_t width, int32_t height);
 
   static bool CanSetProperty(const char* aPrefName);
 
   static void MakeScriptDialogTitle(nsAString& aOutTitle,
                                     nsIPrincipal* aSubjectPrincipal);
 
   // Outer windows only.
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   bool CanMoveResizeWindows(mozilla::dom::CallerType aCallerType);
 
   // If aDoFlush is true, we'll flush our own layout; otherwise we'll try to
   // just flush our parent and only flush ourselves if we think we need to.
   // Outer windows only.
   mozilla::CSSPoint GetScrollXY(bool aDoFlush);
 
   int32_t GetScrollBoundaryOuter(mozilla::Side aSide);
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -1991,17 +1991,17 @@ bool EventStateManager::DoDefaultDragSta
   uint32_t action = aDataTransfer->EffectAllowedInt();
   if (action == nsIDragService::DRAGDROP_ACTION_UNINITIALIZED)
     action = nsIDragService::DRAGDROP_ACTION_COPY |
              nsIDragService::DRAGDROP_ACTION_MOVE |
              nsIDragService::DRAGDROP_ACTION_LINK;
 
   // get any custom drag image that was set
   int32_t imageX, imageY;
-  Element* dragImage = aDataTransfer->GetDragImage(&imageX, &imageY);
+  RefPtr<Element> dragImage = aDataTransfer->GetDragImage(&imageX, &imageY);
 
   nsCOMPtr<nsIArray> transArray = aDataTransfer->GetTransferables(dragTarget);
   if (!transArray) return false;
 
   // After this function returns, the DataTransfer will be cleared so it appears
   // empty to content. We need to pass a DataTransfer into the Drag Session, so
   // we need to make a copy.
   RefPtr<DataTransfer> dataTransfer;
--- a/dom/events/EventStateManager.h
+++ b/dom/events/EventStateManager.h
@@ -1083,16 +1083,17 @@ class EventStateManager : public nsSuppo
    *
    * aDragEvent - the dragstart event
    * aDataTransfer - the data transfer that holds the data to be dragged
    * aDragTarget - the target of the drag
    * aSelection - the selection to be dragged
    * aPrincipal - the triggering principal of the drag, or null if it's from
    *              browser chrome or OS
    */
+  MOZ_CAN_RUN_SCRIPT
   bool DoDefaultDragStart(nsPresContext* aPresContext,
                           WidgetDragEvent* aDragEvent,
                           dom::DataTransfer* aDataTransfer,
                           nsIContent* aDragTarget, dom::Selection* aSelection,
                           nsIPrincipal* aPrincipal);
 
   bool IsTrackingDragGesture() const { return mGestureDownContent != nullptr; }
   /**
@@ -1268,17 +1269,18 @@ class EventStateManager : public nsSuppo
 
   // Functions used for click hold context menus
   nsCOMPtr<nsITimer> mClickHoldTimer;
   void CreateClickHoldTimer(nsPresContext* aPresContext, nsIFrame* aDownFrame,
                             WidgetGUIEvent* aMouseDownEvent);
   void KillClickHoldTimer();
   void FireContextClick();
 
-  static void SetPointerLock(nsIWidget* aWidget, nsIContent* aElement);
+  MOZ_CAN_RUN_SCRIPT static void SetPointerLock(nsIWidget* aWidget,
+                                                nsIContent* aElement);
   static void sClickHoldCallback(nsITimer* aTimer, void* aESM);
 };
 
 /**
  * This class is used while processing real user input. During this time, popups
  * are allowed. For mousedown events, mouse capturing is also permitted.
  */
 class AutoHandlingUserInputStatePusher {
--- a/dom/html/HTMLButtonElement.h
+++ b/dom/html/HTMLButtonElement.h
@@ -46,16 +46,17 @@ class HTMLButtonElement final : public n
   NS_IMETHOD SaveState() override;
   bool RestoreState(PresState* aState) override;
   virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override;
 
   virtual void FieldSetDisabledChanged(bool aNotify) override;
 
   // EventTarget
   void GetEventTargetParent(EventChainPreVisitor& aVisitor) override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   virtual nsresult PostHandleEvent(EventChainPostVisitor& aVisitor) override;
 
   // nsINode
   virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override;
   virtual JSObject* WrapNode(JSContext* aCx,
                              JS::Handle<JSObject*> aGivenProto) override;
 
   // nsIContent
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -3853,17 +3853,17 @@ nsresult HTMLInputElement::PostHandleEve
                keyEvent->mKeyCode == NS_VK_RETURN) ||
               (aVisitor.mEvent->mMessage == eKeyUp &&
                keyEvent->mKeyCode == NS_VK_SPACE)) {
             switch (mType) {
               case NS_FORM_INPUT_CHECKBOX:
               case NS_FORM_INPUT_RADIO: {
                 // Checkbox and Radio try to submit on Enter press
                 if (keyEvent->mKeyCode != NS_VK_SPACE) {
-                  MaybeSubmitForm(aVisitor.mPresContext);
+                  MaybeSubmitForm(MOZ_KnownLive(aVisitor.mPresContext));
 
                   break;  // If we are submitting, do not send click event
                 }
                 // else fall through and treat Space like click...
                 MOZ_FALLTHROUGH;
               }
               case NS_FORM_INPUT_BUTTON:
               case NS_FORM_INPUT_RESET:
@@ -3930,17 +3930,17 @@ nsresult HTMLInputElement::PostHandleEve
            */
 
           if (aVisitor.mEvent->mMessage == eKeyPress &&
               keyEvent->mKeyCode == NS_VK_RETURN &&
               (IsSingleLineTextControl(false, mType) ||
                mType == NS_FORM_INPUT_NUMBER ||
                IsExperimentalMobileType(mType) || IsDateTimeInputType(mType))) {
             FireChangeEventIfNeeded();
-            rv = MaybeSubmitForm(aVisitor.mPresContext);
+            rv = MaybeSubmitForm(MOZ_KnownLive(aVisitor.mPresContext));
             NS_ENSURE_SUCCESS(rv, rv);
           }
 
           if (aVisitor.mEvent->mMessage == eKeyPress &&
               mType == NS_FORM_INPUT_RANGE && !keyEvent->IsAlt() &&
               !keyEvent->IsControl() && !keyEvent->IsMeta() &&
               (keyEvent->mKeyCode == NS_VK_LEFT ||
                keyEvent->mKeyCode == NS_VK_RIGHT ||
--- a/dom/html/HTMLInputElement.h
+++ b/dom/html/HTMLInputElement.h
@@ -1012,17 +1012,17 @@ class HTMLInputElement final : public ns
 
   void RadioSetChecked(bool aNotify);
   void SetCheckedChanged(bool aCheckedChanged);
 
   /**
    * MaybeSubmitForm looks for a submit input or a single text control
    * and submits the form if either is present.
    */
-  nsresult MaybeSubmitForm(nsPresContext* aPresContext);
+  MOZ_CAN_RUN_SCRIPT nsresult MaybeSubmitForm(nsPresContext* aPresContext);
 
   /**
    * Update mFileList with the currently selected file.
    */
   void UpdateFileList();
 
   /**
    * Called after calling one of the SetFilesOrDirectories() functions.
--- a/dom/ipc/BrowserChild.h
+++ b/dom/ipc/BrowserChild.h
@@ -354,16 +354,17 @@ class BrowserChild final : public Browse
 
   mozilla::ipc::IPCResult RecvRealMouseButtonEvent(
       const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
       const uint64_t& aInputBlockId);
   mozilla::ipc::IPCResult RecvNormalPriorityRealMouseButtonEvent(
       const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
       const uint64_t& aInputBlockId);
 
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   mozilla::ipc::IPCResult RecvRealDragEvent(const WidgetDragEvent& aEvent,
                                             const uint32_t& aDragAction,
                                             const uint32_t& aDropEffect,
                                             nsIPrincipal* aPrincipal);
 
   mozilla::ipc::IPCResult RecvRealKeyEvent(
       const mozilla::WidgetKeyboardEvent& aEvent);
 
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -449,16 +449,17 @@ class ContentChild final : public PConte
                                                const uint32_t& aChangeType,
                                                const Maybe<URIParams>& aDomain);
 
   mozilla::ipc::IPCResult RecvShutdown();
 
   mozilla::ipc::IPCResult RecvInvokeDragSession(
       nsTArray<IPCDataTransfer>&& aTransfers, const uint32_t& aAction);
 
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   mozilla::ipc::IPCResult RecvEndDragSession(
       const bool& aDoneDrag, const bool& aUserCancelled,
       const mozilla::LayoutDeviceIntPoint& aEndDragPoint,
       const uint32_t& aKeyModifiers);
 
   mozilla::ipc::IPCResult RecvPush(const nsCString& aScope,
                                    const IPC::Principal& aPrincipal,
                                    const nsString& aMessageId);
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2155,17 +2155,17 @@ MediaDecoderStateMachine::StateObject::S
     return SetState<NextFrameSeekingState>(std::move(aSeekJob), aVisibility);
   }
 
   MOZ_ASSERT_UNREACHABLE("Unknown SeekTarget::Type.");
   return nullptr;
 }
 
 void MediaDecoderStateMachine::StateObject::SetDecodingState() {
-  if (mMaster->mLooping && mMaster->mSeamlessLoopingAllowed) {
+  if (mMaster->IsInSeamlessLooping()) {
     SetState<LoopingDecodingState>();
     return;
   }
   SetState<DecodingState>();
 }
 
 void MediaDecoderStateMachine::DecodeMetadataState::OnMetadataRead(
     MetadataHolder&& aMetadata) {
@@ -2271,20 +2271,22 @@ void MediaDecoderStateMachine::DecodingS
       !mMaster->mVideoDecodeSuspendTimer.IsScheduled() &&
       !mMaster->mVideoDecodeSuspended) {
     // If the VideoDecodeMode is Suspend and the timer is not schedule, it means
     // the timer has timed out and we should suspend video decoding now if
     // necessary.
     HandleVideoSuspendTimeout();
   }
 
-  // If decoding has ended and we are not in looping, we don't need to decode
-  // anything later.
+  // If we're in the normal decoding mode and the decoding has finished, then we
+  // should go to `completed` state because we don't need to decode anything
+  // later. However, if we're in the saemless decoding mode, we will restart
+  // decoding ASAP so we can still stay in `decoding` state.
   if (!mMaster->IsVideoDecoding() && !mMaster->IsAudioDecoding() &&
-      !mMaster->mLooping) {
+      !mMaster->IsInSeamlessLooping()) {
     SetState<CompletedState>();
     return;
   }
 
   mOnAudioPopped =
       AudioQueue().PopFrontEvent().Connect(OwnerThread(), [this]() {
         if (mMaster->IsAudioDecoding() && !mMaster->HaveEnoughDecodedAudio()) {
           EnsureAudioDecodeTaskQueued();
@@ -3932,16 +3934,20 @@ void MediaDecoderStateMachine::CancelSus
 void MediaDecoderStateMachine::AdjustByLooping(media::TimeUnit& aTime) const {
   MOZ_ASSERT(OnTaskQueue());
   if (mAudioDecodedDuration.isSome() &&
       mAudioDecodedDuration.ref().IsPositive()) {
     aTime = aTime % mAudioDecodedDuration.ref();
   }
 }
 
+bool MediaDecoderStateMachine::IsInSeamlessLooping() const {
+  return mLooping && mSeamlessLoopingAllowed;
+}
+
 }  // namespace mozilla
 
 // avoid redefined macro in unified build
 #undef LOG
 #undef LOGV
 #undef LOGW
 #undef LOGE
 #undef SLOGW
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -620,16 +620,18 @@ class MediaDecoderStateMachine
   MozPromiseRequestHolder<WaitForDataPromise> mVideoWaitRequest;
 
   const char* AudioRequestStatus() const;
   const char* VideoRequestStatus() const;
 
   void OnSuspendTimerResolved();
   void CancelSuspendTimer();
 
+  bool IsInSeamlessLooping() const;
+
   bool mCanPlayThrough = false;
 
   bool mIsLiveStream = false;
 
   // True if we shouldn't play our audio (but still write it to any capturing
   // streams). When this is true, the audio thread will never start again after
   // it has stopped.
   bool mAudioCaptured;
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -1299,16 +1299,18 @@ tags = suspend
 skip-if = toolkit == 'android' # android(bug 1304480)
 tags = suspend
 [test_background_video_no_suspend_not_in_tree.html]
 skip-if = toolkit == 'android' # bug 1346705
 tags = suspend
 [test_background_video_resume_after_end_show_last_frame.html]
 skip-if = toolkit == 'android' # bug 1346705
 tags = suspend
+[test_background_video_resume_looping_video_without_audio.html]
+tags = suspend
 [test_background_video_suspend.html]
 skip-if = toolkit == 'android' # android(bug 1304480)
 tags = suspend
 [test_background_video_suspend_ends.html]
 skip-if = toolkit == 'android' # bug 1295884, android(bug 1304480, bug 1232305)
 tags = suspend
 [test_background_video_tainted_by_capturestream.html]
 skip-if = toolkit == 'android' # bug 1346705
new file mode 100644
--- /dev/null
+++ b/dom/media/test/test_background_video_resume_looping_video_without_audio.html
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Resume suspended looping video which doesn't contain audio track</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="manifest.js"></script>
+  <script src="background_video.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<script class="testbody" type="text/javascript">
+/**
+ * This test is used to ensure that the looping video (without audio track) which
+ * has been suspended can continute to playback correctly after we resume video
+ * decoding.
+ */
+async function startTest() {
+  const video = await createVisibleVideo();
+  await startVideo(video);
+  await suspendVideoDecoding(video);
+  await resumeVideoDecoding(video);
+  await waitUntilVideoLoopAgain(video);
+  endTestAndClearVideo(video);
+}
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ 'set': [
+    ["media.test.video-suspend", true],
+    ["media.suspend-bkgnd-video.enabled", true],
+    ["media.suspend-bkgnd-video.delay-ms", 0],
+  ]}, () => {
+  startTest();
+});
+
+/**
+ * The following are test helper functions.
+ */
+async function createVisibleVideo() {
+  let video = document.createElement("video");
+  video.src = "gizmo-noaudio.webm";
+  video.controls = true;
+  video.loop = true;
+  // In order to reduce the test running time, because we don't need to acutally
+  // go through the whole video.
+  video.currentTime = 3;
+  document.body.appendChild(video);
+  info(`ensure video becomes visible`);
+  await waitUntilVisible(video);
+  return video;
+}
+
+async function startVideo(video) {
+  info(`start playing video`);
+  const played = video && await video.play().then(() => true, () => false);
+  ok(played, "video has started playing");
+}
+
+async function suspendVideoDecoding(video) {
+  info(`suspend video decoding`);
+  video.setVisible(false);
+  await nextVideoSuspends(video);
+}
+
+async function resumeVideoDecoding(video) {
+  info(`resume video decoding.`);
+  video.setVisible(true);
+  await nextVideoResumes(video);
+}
+
+async function waitUntilVideoLoopAgain(video) {
+  info(`ensure video is still playing after resuming video decoding.`);
+  await once(video, "seeking");
+  info(`got 'seeking' event.`);
+  await once(video, "seeked");
+  ok(!video.paused, "video is still playing and looping again.")
+}
+
+function endTestAndClearVideo(video) {
+  removeNodeAndSource(video);
+  SimpleTest.finish();
+}
+
+</script>
+</body>
+</html>
--- a/dom/svg/SVGSVGElement.h
+++ b/dom/svg/SVGSVGElement.h
@@ -97,17 +97,18 @@ class SVGSVGElement final : public SVGSV
 
   /**
    * For use by zoom controls to allow currentScale, currentTranslate.x and
    * currentTranslate.y to be set by a single operation that dispatches a
    * single SVGZoom event (instead of one SVGZoom and two SVGScroll events).
    *
    * XXX SVGZoomEvent is no more, is this needed?
    */
-  void SetCurrentScaleTranslate(float s, float x, float y);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void SetCurrentScaleTranslate(float s, float x,
+                                                            float y);
 
   // nsIContent interface
   void GetEventTargetParent(EventChainPreVisitor& aVisitor) override;
   virtual bool IsEventAttributeNameInternal(nsAtom* aName) override;
 
   // nsINode methods:
   virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override;
 
--- a/gfx/2d/DrawTargetCairo.h
+++ b/gfx/2d/DrawTargetCairo.h
@@ -169,17 +169,17 @@ class DrawTargetCairo final : public Dra
   // Call to set up aContext for drawing (with the current transform, etc).
   // Pass the path you're going to be using if you have one.
   // Implicitly calls WillChange(aPath).
   void PrepareForDrawing(cairo_t* aContext, const Path* aPath = nullptr);
 
   static cairo_surface_t* GetDummySurface();
 
   // Cairo hardcodes this as its maximum surface size.
-  static size_t GetMaxSurfaceSize() { return 32767; }
+  static size_t GetMaxSurfaceSize() { return 32766; }
 
  private:  // methods
   // Init cairo surface without doing a cairo_surface_reference() call.
   bool InitAlreadyReferenced(cairo_surface_t* aSurface, const IntSize& aSize,
                              SurfaceFormat* aFormat = nullptr);
   enum DrawPatternType { DRAW_FILL, DRAW_STROKE };
   void DrawPattern(const Pattern& aPattern, const StrokeOptions& aStrokeOptions,
                    const DrawOptions& aOptions, DrawPatternType aDrawType,
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -213,17 +213,24 @@ bool BasicAsyncReadbackBuffer::MapAndCop
 
 BasicCompositor::BasicCompositor(CompositorBridgeParent* aParent,
                                  widget::CompositorWidget* aWidget)
     : Compositor(aWidget, aParent),
       mIsPendingEndRemoteDrawing(false),
       mFullWindowRenderTarget(nullptr) {
   MOZ_COUNT_CTOR(BasicCompositor);
 
-  mMaxTextureSize = Factory::GetMaxSurfaceSize(gfxVars::ContentBackend());
+  // The widget backends may create intermediate Cairo surfaces to deal with
+  // various window buffers, regardless of actual content backend type, when
+  // using the basic compositor. Ensure that the buffers will be able to fit
+  // in or blit with a Cairo surface.
+  mMaxTextureSize =
+      std::min(Factory::GetMaxSurfaceSize(gfxVars::ContentBackend()),
+               Factory::GetMaxSurfaceSize(BackendType::CAIRO));
+
 }
 
 BasicCompositor::~BasicCompositor() { MOZ_COUNT_DTOR(BasicCompositor); }
 
 bool BasicCompositor::Initialize(nsCString* const out_failureReason) {
   return mWidget ? mWidget->InitCompositor(this) : false;
 };
 
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -7428,17 +7428,17 @@ GeneralParser<ParseHandler, Unit>::field
 
   UnaryNodeType exprStatement =
       handler_.newExprStatement(initializerPropInit, wholeInitializerPos.end);
   if (!exprStatement) {
     return null();
   }
 
   ListNodeType statementList = handler_.newStatementList(wholeInitializerPos);
-  if (!argsbody) {
+  if (!statementList) {
     return null();
   }
   handler_.addStatementToList(statementList, exprStatement);
 
   // Set the function's body to the field assignment.
   LexicalScopeNodeType initializerBody =
       finishLexicalScope(pc_->varScope(), statementList);
   if (!initializerBody) {
--- a/layout/base/PresShell.h
+++ b/layout/base/PresShell.h
@@ -649,26 +649,26 @@ class PresShell final : public nsStubDoc
     EventHandler eventHandler(*this);
     return eventHandler.HandleEventWithTarget(
         aEvent, aFrame, aContent, aEventStatus, aIsHandlingNativeEvent,
         aTargetContent, aOverrideClickTarget);
   }
 
   /**
    * Dispatch event to content only (NOT full processing)
-   * @note The caller must have a strong reference to the PresShell.
    */
+  MOZ_CAN_RUN_SCRIPT
   nsresult HandleDOMEventWithTarget(nsIContent* aTargetContent,
                                     WidgetEvent* aEvent,
                                     nsEventStatus* aStatus);
 
   /**
    * Dispatch event to content only (NOT full processing)
-   * @note The caller must have a strong reference to the PresShell.
    */
+  MOZ_CAN_RUN_SCRIPT
   nsresult HandleDOMEventWithTarget(nsIContent* aTargetContent,
                                     dom::Event* aEvent, nsEventStatus* aStatus);
 
   /**
    * Return whether or not the event is valid to be dispatched
    */
   bool CanDispatchEvent(const WidgetGUIEvent* aEvent = nullptr) const;
 
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4702,16 +4702,23 @@ nsIFrame* nsLayoutUtils::GetParentOrPlac
 }
 
 nsIFrame* nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(nsIFrame* aFrame) {
   nsIFrame* f = GetParentOrPlaceholderFor(aFrame);
   if (f) return f;
   return GetCrossDocParentFrame(aFrame);
 }
 
+nsIFrame* nsLayoutUtils::GetDisplayListParent(nsIFrame* aFrame) {
+  if (aFrame->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT) {
+    return aFrame->GetParent();
+  }
+  return nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(aFrame);
+}
+
 nsIFrame* nsLayoutUtils::GetNextContinuationOrIBSplitSibling(nsIFrame* aFrame) {
   nsIFrame* result = aFrame->GetNextContinuation();
   if (result) return result;
 
   if ((aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) != 0) {
     // We only store the ib-split sibling annotation with the first
     // frame in the continuation chain. Walk back to find that frame now.
     aFrame = aFrame->FirstContinuation();
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1392,16 +1392,25 @@ class nsLayoutUtils {
 
   /**
    * If aFrame is an out of flow frame, return its placeholder, otherwise
    * return its (possibly cross-doc) parent.
    */
   static nsIFrame* GetParentOrPlaceholderForCrossDoc(nsIFrame* aFrame);
 
   /**
+   * Returns the frame that would act as the parent of aFrame when
+   * descending through the frame tree in display list building.
+   * Usually the same as GetParentOrPlaceholderForCrossDoc, except
+   * that pushed floats are treated as children of their containing
+   * block.
+   */
+  static nsIFrame* GetDisplayListParent(nsIFrame* aFrame);
+
+  /**
    * Get a frame's next-in-flow, or, if it doesn't have one, its
    * block-in-inline-split sibling.
    */
   static nsIFrame* GetNextContinuationOrIBSplitSibling(nsIFrame* aFrame);
 
   /**
    * Get the first frame in the continuation-plus-ib-split-sibling chain
    * containing aFrame.
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -89,17 +89,17 @@ nsComboboxControlFrame::RedisplayTextEve
  */
 class nsComboButtonListener final : public nsIDOMEventListener {
  private:
   virtual ~nsComboButtonListener() {}
 
  public:
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD HandleEvent(dom::Event*) override {
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHOD HandleEvent(dom::Event*) override {
     mComboBox->ShowDropDown(!mComboBox->IsDroppedDown());
     return NS_OK;
   }
 
   explicit nsComboButtonListener(nsComboboxControlFrame* aCombobox) {
     mComboBox = aCombobox;
   }
 
@@ -310,17 +310,18 @@ void nsComboboxControlFrame::ShowPopup(b
   // fire a popup dom event if it is safe to do so
   RefPtr<mozilla::PresShell> presShell = PresContext()->GetPresShell();
   if (presShell && nsContentUtils::IsSafeToRunScript()) {
     nsEventStatus status = nsEventStatus_eIgnore;
     WidgetMouseEvent event(true,
                            aShowPopup ? eXULPopupShowing : eXULPopupHiding,
                            nullptr, WidgetMouseEvent::eReal);
 
-    presShell->HandleDOMEventWithTarget(mContent, &event, &status);
+    nsCOMPtr<nsIContent> content = mContent;
+    presShell->HandleDOMEventWithTarget(content, &event, &status);
   }
 }
 
 bool nsComboboxControlFrame::ShowList(bool aShowList) {
   nsView* view = mDropdownFrame->GetView();
   if (aShowList) {
     NS_ASSERTION(
         !view->HasWidget(),
@@ -490,17 +491,17 @@ nsPoint nsComboboxControlFrame::GetCSSTr
   }
   return translation;
 }
 
 class nsAsyncRollup : public Runnable {
  public:
   explicit nsAsyncRollup(nsComboboxControlFrame* aFrame)
       : mozilla::Runnable("nsAsyncRollup"), mFrame(aFrame) {}
-  NS_IMETHOD Run() override {
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHOD Run() override {
     if (mFrame.IsAlive()) {
       static_cast<nsComboboxControlFrame*>(mFrame.GetFrame())->RollupFromList();
     }
     return NS_OK;
   }
   WeakFrame mFrame;
 };
 
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -81,16 +81,17 @@ class nsComboboxControlFrame final : pub
   virtual nscoord GetMinISize(gfxContext* aRenderingContext) override;
 
   virtual nscoord GetPrefISize(gfxContext* aRenderingContext) override;
 
   virtual void Reflow(nsPresContext* aCX, ReflowOutput& aDesiredSize,
                       const ReflowInput& aReflowInput,
                       nsReflowStatus& aStatus) override;
 
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   virtual nsresult HandleEvent(nsPresContext* aPresContext,
                                mozilla::WidgetGUIEvent* aEvent,
                                nsEventStatus* aEventStatus) override;
 
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
   void PaintFocus(DrawTarget& aDrawTarget, nsPoint aPt);
@@ -130,26 +131,20 @@ class nsComboboxControlFrame final : pub
    * @param aRepaint if true then force repaint (NOTE: we always force repaint
    *        currently)
    * @note This method might destroy |this|.
    */
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   virtual void SetFocus(bool aOn, bool aRepaint) override;
 
   bool IsDroppedDown() { return mDroppedDown; }
-  /**
-   * @note This method might destroy |this|.
-   */
-  void ShowDropDown(bool aDoDropDown);
+  MOZ_CAN_RUN_SCRIPT void ShowDropDown(bool aDoDropDown);
   nsIFrame* GetDropDown();
   void SetDropDown(nsIFrame* aDropDownFrame);
-  /**
-   * @note This method might destroy |this|.
-   */
-  void RollupFromList();
+  MOZ_CAN_RUN_SCRIPT void RollupFromList();
 
   /**
    * Return the available space before and after this frame for
    * placing the drop-down list, and the current 2D translation.
    * Note that either or both can be less than or equal to zero,
    * if both are then the drop-down should be closed.
    */
   void GetAvailableDropdownSpace(mozilla::WritingMode aWM, nscoord* aBefore,
@@ -207,16 +202,17 @@ class nsComboboxControlFrame final : pub
       nsTArray<nsIWidget*>* aWidgetChain) override {
     return 0;
   }
 
   virtual nsIWidget* GetRollupWidget() override;
 
   // nsIStatefulFrame
   mozilla::UniquePtr<mozilla::PresState> SaveState() override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
   NS_IMETHOD RestoreState(mozilla::PresState* aState) override;
   NS_IMETHOD GenerateStateKey(nsIContent* aContent,
                               mozilla::dom::Document* aDocument,
                               nsACString& aKey) override;
 
   static bool ToolkitHasNativePopup();
 
  protected:
@@ -256,25 +252,25 @@ class nsComboboxControlFrame final : pub
    private:
     nsComboboxControlFrame* mControlFrame;
   };
 
   /**
    * Show or hide the dropdown list.
    * @note This method might destroy |this|.
    */
-  void ShowPopup(bool aShowPopup);
+  MOZ_CAN_RUN_SCRIPT void ShowPopup(bool aShowPopup);
 
   /**
    * Show or hide the dropdown list.
    * @param aShowList true to show, false to hide the dropdown.
    * @note This method might destroy |this|.
    * @return false if this frame is destroyed, true if still alive.
    */
-  bool ShowList(bool aShowList);
+  MOZ_CAN_RUN_SCRIPT bool ShowList(bool aShowList);
   void CheckFireOnChange();
   void FireValueChangeEvent();
   nsresult RedisplayText();
   void HandleRedisplayTextEvent();
   void ActuallyDisplayText(bool aNotify);
 
  private:
   // If our total transform to the root frame of the root document is only a 2d
--- a/layout/painting/RetainedDisplayListBuilder.cpp
+++ b/layout/painting/RetainedDisplayListBuilder.cpp
@@ -292,21 +292,17 @@ bool AnyContentAncestorModified(nsIFrame
     if (f->IsFrameModified()) {
       return true;
     }
 
     if (aStopAtFrame && f == aStopAtFrame) {
       break;
     }
 
-    if (f->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT) {
-      f = f->GetParent();
-    } else {
-      f = nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(f);
-    }
+    f = nsLayoutUtils::GetDisplayListParent(f);
   }
 
   return false;
 }
 
 static Maybe<const ActiveScrolledRoot*> SelectContainerASR(
     const DisplayItemClipChain* aClipChain, const ActiveScrolledRoot* aItemASR,
     Maybe<const ActiveScrolledRoot*>& aContainerASR) {
@@ -1201,17 +1197,17 @@ static void AddFramesForContainingBlock(
 // descendants of a modified frame (us, or another frame we'll get to soon).
 // This is combined with the work required for MarkFrameForDisplayIfVisible,
 // so that we can avoid an extra ancestor walk, and we can reuse the flag
 // to detect when we've already visited an ancestor (and thus all further
 // ancestors must also be visited).
 static void FindContainingBlocks(nsIFrame* aFrame,
                                  nsTArray<nsIFrame*>& aExtraFrames) {
   for (nsIFrame* f = aFrame; f;
-       f = nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(f)) {
+       f = nsLayoutUtils::GetDisplayListParent(f)) {
     if (f->ForceDescendIntoIfVisible()) return;
     f->SetForceDescendIntoIfVisible(true);
     CRR_LOG("Considering OOFs for %p\n", f);
 
     AddFramesForContainingBlock(f, f->GetChildList(nsIFrame::kFloatList),
                                 aExtraFrames);
     AddFramesForContainingBlock(f, f->GetChildList(f->GetAbsoluteListID()),
                                 aExtraFrames);
new file mode 100644
--- /dev/null
+++ b/layout/painting/crashtests/1549909.html
@@ -0,0 +1,9 @@
+<style>
+* {
+  -webkit-column-break-after: always;
+  float: left;
+  column-width: 0px;
+}
+</style>
+}
+<video controls="controls">
--- a/layout/painting/crashtests/crashtests.list
+++ b/layout/painting/crashtests/crashtests.list
@@ -13,9 +13,10 @@ load 1454105-1.html
 load 1455944-1.html
 load 1465305-1.html
 load 1468124-1.html
 load 1469472.html
 load 1477831-1.html
 load 1504033.html
 load 1514544-1.html
 load 1547420-1.html
+load 1549909.html
 
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -273,17 +273,17 @@ fuzzy(0-127,0-500) css-multicol/multicol
 fuzzy(0-127,0-500) css-multicol/multicol-rule-outset-000.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-rule-px-001.xht
 fuzzy(0-127,0-500) css-multicol/multicol-rule-ridge-000.xht
 fuzzy(0-106,0-354) css-multicol/multicol-rule-solid-000.xht
 fails-if(!OSX) random-if(OSX) css-multicol/multicol-rule-stacking-001.xht
 fails-if(!OSX||webrender) random-if(OSX) css-multicol/multicol-shorthand-001.xht
 
 # Bug 1547160: Fix existing reftests failure related to column-span
-pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-000.xht
+pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-000.xht
 pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-001.xht
 pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-002.xht
 pref(layout.css.column-span.enabled,true) fails-if(!OSX) random-if(OSX) css-multicol/multicol-span-all-003.xht
 pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-001.xht
 pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-002.xht
 pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-bottom-001.xht
 pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-nested-001.xht
 pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-nested-002.xht
--- a/layout/reftests/w3c-css/import-tests.py
+++ b/layout/reftests/w3c-css/import-tests.py
@@ -5,17 +5,16 @@
 import os
 from optparse import OptionParser
 from subprocess import Popen, PIPE
 import xml.dom.minidom
 import html5lib
 import fnmatch
 import shutil
 import string
-import sys
 import re
 
 # FIXME:
 #   * Import more tests rather than just the very limited set currently
 #     chosen.
 #   * Read in a (checked-in) input file with a list of test assertions
 #     expected to fail.
 #   * Read in a (checked-in) input file with a list of reference choices
@@ -34,31 +33,26 @@ gSubtrees = [
     os.path.join("css-namespaces"),
     os.path.join("css-conditional"),
     os.path.join("css-values"),
     os.path.join("css-multicol"),
     os.path.join("css-writing-modes"),
     os.path.join("selectors"),
 ]
 
+# Insert the properties which you want to add "-moz" prefix to
+# gPrefixedProperties.
+#
+# For example, if "columns" is in this list, all the lines in import files
+# containing "columns" are replaced with "-moz-columns."
 gPrefixedProperties = [
-    "column-count",
-    "column-fill",
-    "column-gap",
-    "column-rule",
-    "column-rule-color",
-    "column-rule-style",
-    "column-rule-width",
-    "columns",
-    "column-span",
-    "column-width"
 ]
 
-gPrefixRegexp = re.compile(
-    r"([^-#]|^)(" + r"|".join(gPrefixedProperties) + r")\b")
+gPrefixRegexp = (re.compile(r"([^-#]|^)(" + r"|".join(gPrefixedProperties) + r")\b")
+                 if gPrefixedProperties else None)
 
 # Map of about:config prefs that need toggling, for a given test subdirectory.
 # Entries should look like:
 #  "$SUBDIR_NAME": "pref($PREF_NAME, $PREF_VALUE)"
 #
 # For example, when "@supports" was behind a pref, gDefaultPreferences had:
 #  "css3-conditional": "pref(layout.css.supports-rule.enabled,true)"
 gDefaultPreferences = {
@@ -167,17 +161,16 @@ def copy_support_files(test, dirname):
             copy_file(test, full_srcname, destname, True)
 
 def map_file(srcname):
     global gSrcPath
     srcname = to_unix_path_sep(os.path.normpath(srcname))
     if srcname in filemap:
         return filemap[srcname]
     destname = to_unix_path_sep(os.path.relpath(srcname, gSrcPath))
-    destdir = os.path.dirname(destname)
     filemap[srcname] = destname
     load_flags_for(srcname, destname)
     copy_file(destname, srcname, destname, False)
     copy_support_files(destname, os.path.dirname(srcname))
     return destname
 
 def load_flags_for(srcname, destname):
     global gTestFlags
@@ -255,31 +248,31 @@ AHEM_DECL_XML = """<style type="text/css
 """ + AHEM_DECL_CONTENT + """
 ]]></style>
 """
 
 def copy_and_prefix(test, aSourceFileName, aDestFileName, isSupportFile=False):
     global gTestFlags, gPrefixRegexp
     newFile = open(aDestFileName, 'wb')
     unPrefixedFile = open(aSourceFileName, 'rb')
-    testName = aDestFileName[len(gDestPath)+1:]
     ahemFontAdded = False
     for line in unPrefixedFile:
         replacementLine = line
         searchRegex = "\s*<style\s*"
 
         if not isSupportFile and not ahemFontAdded and 'ahem' in gTestFlags[test] and re.search(searchRegex, line):
             # First put our ahem font declation before the first <style>
             # element
             template = AHEM_DECL_HTML if is_html(aDestFileName) else AHEM_DECL_XML
             ahemPath = os.path.relpath(AHEM_FONT_PATH, os.path.dirname(aDestFileName))
             newFile.write(template.format(to_unix_path_sep(ahemPath)))
             ahemFontAdded = True
 
-        replacementLine = gPrefixRegexp.sub(r"\1-moz-\2", replacementLine)
+        if gPrefixRegexp:
+            replacementLine = gPrefixRegexp.sub(r"\1-moz-\2", replacementLine)
         newFile.write(replacementLine)
 
     newFile.close()
     unPrefixedFile.close()
 
 def read_options():
     global gArgs, gOptions
     op = OptionParser()
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-001.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-001.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-columns: [integer]</title>
+	<title>CSS Test: Multi-column element via columns: [integer]</title>
 	<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
 	<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-columns: 3;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			columns: 3;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-002.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-002.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-column-count: [integer]</title>
+	<title>CSS Test: Multi-column element via column-count: [integer]</title>
 	<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
 	<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-column-count: 3;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			column-count: 3;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-003.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-003.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-columns: [width]</title>
+	<title>CSS Test: Multi-column element via columns: [width]</title>
 	<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
 	<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-columns: 120px;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			columns: 120px;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-004.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-004.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <!-- Submitted from TestTWF Paris -->
 <head>
 	<meta charset="utf-8">
-	<title>CSS Test: Multi-column element via -moz-column-width: [width]</title>
+	<title>CSS Test: Multi-column element via column-width: [width]</title>
 	<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
 	<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
 	<link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
 	<link rel="match" href="reference/multicol-basic-ref.html"/>
 	<meta name="flags" content="ahem"/>
 	<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
 
 <style type="text/css">
@@ -27,19 +27,19 @@
 			display: inline-block;
 			margin: 1em auto;
 			width: 360px;
 		}
 
 		.multicol-basic-ref{
 			background: yellow;
 			width: 360px;
-			-moz-column-width: 120px;
-			-moz-column-gap: 0;
-			-moz-column-rule: none;
+			column-width: 120px;
+			column-gap: 0;
+			column-rule: none;
 		}
 
 		.multicol-basic-ref-item{
 			background: #000;
 		}
 
 		.item-1{
 			background: purple;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-005.xht
@@ -1,24 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>CSS Multi-column Layout Test: -moz-columns as -moz-column-count (basic)</title>
+<title>CSS Multi-column Layout Test: columns as column-count (basic)</title>
 <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
 <link rel="match" href="reference/multicol-basic-005-ref.xht"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#columns"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-count"/>
 <style type="text/css">
 div {
   margin: 1em auto;
   background: yellow;
   border: thin solid black;
   width: 600px;
-  -moz-columns: 3;
-  -moz-column-gap: 0;
-  -moz-column-rule: none;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
 }
 </style>
 </head>
 <body>
-<div>This multicol element should have a width of 600 pixels and the content should be flowed into three -moz-columns with no gap or rule between them.</div>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-006.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-006.xht
@@ -1,23 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>CSS Multi-column Layout Test: -moz-column-count (basic)</title>
+<title>CSS Multi-column Layout Test: column-count (basic)</title>
 <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
 <link rel="match" href="reference/multicol-basic-005-ref.xht"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-count"/>
 <style type="text/css">
 div {
   margin: 1em auto;
   background: yellow;
   border: thin solid black;
   width: 600px;
-  -moz-column-count: 3;
-  -moz-column-gap: 0;
-  -moz-column-rule: none;
+  column-count: 3;
+  column-gap: 0;
+  column-rule: none;
 }
 </style>
 </head>
 <body>
-<div>This multicol element should have a width of 600 pixels and the content should be flowed into three -moz-columns with no gap or rule between them.</div>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-007.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-007.xht
@@ -1,24 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>CSS Multi-column Layout Test: -moz-columns as -moz-column-width (basic)</title>
+<title>CSS Multi-column Layout Test: columns as column-width (basic)</title>
 <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
 <link rel="match" href="reference/multicol-basic-005-ref.xht"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#columns"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-width"/>
 <style type="text/css">
 div {
   margin: 1em auto;
   background: yellow;
   border: thin solid black;
   width: 600px;
-  -moz-columns: 200px;
-  -moz-column-gap: 0;
-  -moz-column-rule: none;
+  columns: 200px;
+  column-gap: 0;
+  column-rule: none;
 }
 </style>
 </head>
 <body>
-<div>This multicol element should have a width of 600 pixels and the content should be flowed into three -moz-columns with no gap or rule between them.</div>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-basic-008.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-basic-008.xht
@@ -1,23 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
+<title>CSS Multi-column Layout Test: column-width (basic)</title>
 <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
 <link rel="match" href="reference/multicol-basic-005-ref.xht"/>
 <link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-width"/>
 <style type="text/css">
 div {
   margin: 1em auto;
   background: yellow;
   border: thin solid black;
   width: 600px;
-  -moz-column-width: 200px;
-  -moz-column-gap: 0;
-  -moz-column-rule: none;
+  column-width: 200px;
+  column-gap: 0;
+  column-rule: none;
 }
 </style>
 </head>
 <body>
-<div>This multicol element should have a width of 600 pixels and the content should be flowed into three -moz-columns with no gap or rule between them.</div>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-block-no-clip-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-block-no-clip-001.xht
@@ -18,18 +18,18 @@
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-block-no-clip-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-block-no-clip-002.xht
@@ -18,18 +18,18 @@
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-br-inside-avoidcolumn-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-br-inside-avoidcolumn-001.xht
@@ -4,19 +4,19 @@
 <head>
 <title>multicol | break-inside: avoid-column</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-breaks"/>
 <link rel="match" href="../reference/ref-filled-green-200px-square.html"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 .multicol {
-  -moz-column-count: 2;
-  -moz-column-gap: 0;
-  -moz-column-fill: auto;
+  column-count: 2;
+  column-gap: 0;
+  column-fill: auto;
   overflow: hidden;
   width: 200px;
   height: 300px;
 }
 .multicol > div {
   height: 200px;
   break-inside: avoid-column;
   background: green;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-break-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-break-000.xht
@@ -21,19 +21,19 @@
   margin-bottom: 0.5em;
   font: 1.25em/1 Ahem;
   height: 3em;
   width: 10em;
   }
 
   div#test
   {
-  -moz-column-fill: auto;
-  -moz-column-gap: 0;
-  -moz-column-width: 2em;
+  column-fill: auto;
+  column-gap: 0;
+  column-width: 2em;
 
   /*
 
   N == 5;
 
   W == 2em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-break-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-break-001.xht
@@ -20,19 +20,19 @@
   margin-bottom: 0.5em;
   font: 1.25em/1 Ahem;
   height: 3em;
   width: 10em;
   }
 
   div#test
   {
-  -moz-column-fill: auto;
-  -moz-column-gap: 0;
-  -moz-column-width: 2em;
+  column-fill: auto;
+  column-gap: 0;
+  column-width: 2em;
 
   /*
 
   N == 5;
 
   W == 2em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-clip-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-clip-001.xht
@@ -20,18 +20,18 @@
   background: white;
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 4em;
+  column-count: 3;
+  column-gap: 4em;
   }
 
   span {color: black;}
   ]]></style>
  </head>
  <body>
 
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-clip-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-clip-002.xht
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 4em;
+  column-count: 3;
+  column-gap: 4em;
   }
 
   span {color: black;}
   ]]></style>
  </head>
  <body>
 
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-collapsing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-collapsing-001.xht
@@ -27,18 +27,18 @@
   {
   background-color: yellow;
   color: black;
   margin: 1em;
   width: 8em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   h4
   {
   font: inherit;
   margin: 1em 0 0;
   }
   ]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 100px 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 100px 6' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 100px 6;
-  -moz-column-gap: 0;
+  columns: 100px 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 6 100px' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6 100px;
-  -moz-column-gap: 0;
+  columns: 6 100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-003.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 100px auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 100px auto' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 100px auto;
-  -moz-column-gap: 0;
+  columns: 100px auto;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-004.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: auto 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: auto 100px' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: auto 100px;
-  -moz-column-gap: 0;
+  columns: auto 100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-005.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties. '-moz-columns: 6' is equivalent to '-moz-column-width: auto' and '-moz-column-count: 6'." />
+  <meta name="assert" content="This test checks that 'columns: 6' shorthand correctly set 'column-width' and 'column-count' properties. 'columns: 6' is equivalent to 'column-width: auto' and 'column-count: 6'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6;
-  -moz-column-gap: 0;
+  columns: 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-006.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-006.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: 6 auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: 6 auto' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: 6 auto;
-  -moz-column-gap: 0;
+  columns: 6 auto;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-007.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-007.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: columns shorthand (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-columns: auto 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
+  <meta name="assert" content="This test checks that 'columns: auto 6' shorthand correctly set 'column-width' and 'column-count' properties." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-columns: auto 6;
-  -moz-column-gap: 0;
+  columns: auto 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-invalid-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-invalid-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: invalid -moz-columns shorthand</title>
+  <title>CSS Multi-column Layout Test: invalid columns shorthand</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-columns: 8 normal' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'columns: 8 normal' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-columns: 8 normal;
+  column-count: 4;
+  column-gap: 0;
+  columns: 8 normal;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-invalid-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-invalid-002.xht
@@ -4,23 +4,23 @@
 
   <!--
   Original, initial filename of this test was
   multicol-columns-toolong-002.xht
   and it should be filename-renamed
   multicol-columns-invalid-002.xht
   -->
 
-  <title>CSS Multi-column Layout Test: invalid -moz-columns shorthand</title>
+  <title>CSS Multi-column Layout Test: invalid columns shorthand</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-columns: 8 auto 6em' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'columns: 8 auto 6em' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -28,19 +28,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-columns: 8 auto 6em;
+  column-count: 4;
+  column-gap: 0;
+  columns: 8 auto 6em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-columns-toolong-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-columns-toolong-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: narrower inline content inside wider colum box</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht"/>
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks the rendering of inline content (2em) inside wider (3em) column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-containing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-containing-001.xht
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 0;
+  column-count: 3;
+  column-gap: 0;
   }
 
   span
   {
   color: red;
   position: absolute;
   top: -1em;
   }
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-containing-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-containing-002.xht
@@ -17,18 +17,18 @@
   div
   {
   background-color: white;
   color: green;
   font: 1.25em/1 Ahem;
   position: relative;
   width: 19em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   span {color: red;}
 
   img#white-overlapping
   {
   left: 11em;
   position: absolute;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-columns-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that setting '-moz-column-count' should accordingly create 6 column boxes. In this test, each column box should be exactly 100px wide." />
+  <meta name="assert" content="This test checks that setting 'column-count' should accordingly create 6 column boxes. In this test, each column box should be exactly 100px wide." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {width: 600px;}
@@ -20,18 +20,18 @@
   div
   {
   background-color: yellow;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 6;
-  -moz-column-gap: 0;
+  column-count: 6;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that setting '-moz-column-count' should accordingly create 4 column boxes. In this test, each column box should be exactly 5em wide." />
+  <meta name="assert" content="This test checks that setting 'column-count' should accordingly create 4 column boxes. In this test, each column box should be exactly 5em wide." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   html {background-color: white;}
@@ -25,18 +25,18 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1 333 55555 55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1 22&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555
   </div>
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-003.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule and overflow inside (complex test)</title>
+  <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-29 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-count-computed-003-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be clipped and should overlappe partially the 1st -moz-column-rule." />
+  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be clipped and should overlappe partially the 1st column-rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,62 +20,62 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 13em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.5em;
+  column-count: 3;
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
   }
 
   /*
-  (11)  if (-moz-column-width = auto) and (-moz-column-count != auto) then
-  (12)    N := -moz-column-count;
-  (13)    W := max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  (11)  if (column-width = auto) and (column-count != auto) then
+  (12)    N := column-count;
+  (13)    W := max(0, (available-width - ((N - 1) * column-gap)) / N);
   (14)  exit;
 
-  So, the used -moz-column-count in this test is 3.
+  So, the used column-count in this test is 3.
 
-  W := max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W := max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (13em - ((3 - 1) * 5em)) / 3);
   W == max(0, (13em - (2 * 5em)) / 3);
   W == max(0, (13em - (10em)) / 3);
   W == max(0, (3em) / 3);
   W == max(0, 1em);
   W == 1em;
 
-  So, the used -moz-column-width in this test is 1em.
+  So, the used column-width in this test is 1em.
   */
 
   #pink {color: pink;}
   #orange {color: orange;}
   #purple {color: purple;}
   #gray {color: gray;}
 
   /*
   Since
   "
   content that extends outside column boxes visibly overflows and is not clipped to the column box.
   "
   https://drafts.csswg.org/css-multicol-1/#overflow-inside-multicol-elements
   this causes the right-half (0.5em) of the 'K' glyph to
-  overlap the right-half (0.75em) of the 1st blue -moz-column-rule.
+  overlap the right-half (0.75em) of the 1st blue column-rule.
   Same thing should happen to the 'N' glyph of 'ORAN'.
 
   Because no inline content should be rendered into the
   3rd column box, this causes the 2nd column rule not
   been rendered because
   "
-  Column rules are only drawn between two -moz-columns that
+  Column rules are only drawn between two columns that
   both have content.
   "
   http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
   */
   ]]></style>
  </head>
 
  <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-004.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: both '-moz-column-width' and '-moz-column-count' are 'auto'</title>
+  <title>CSS Multi-column Layout Test: both 'column-width' and 'column-count' are 'auto'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />  <!-- 2013-07-29 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="multicol-count-computed-004-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if '-moz-column-width' is 'auto' and if '-moz-column-count' is 'auto', then such element will not behave like a multi-column element and -moz-column-gap and -moz-column-rule declarations will be ignored." />
+  <meta name="assert" content="This test checks that if 'column-width' is 'auto' and if 'column-count' is 'auto', then such element will not behave like a multi-column element and column-gap and column-rule declarations will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,21 +20,21 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: auto;
-  -moz-column-gap: 7em;
-  -moz-column-rule-color: red;
-  -moz-column-rule-width: 1.5em;
-  -moz-column-rule-style: solid;
+  column-count: auto;
+  column-gap: 7em;
+  column-rule-color: red;
+  column-rule-width: 1.5em;
+  column-rule-style: solid;
   }
 
   #pink {color: pink;}
   #orange {color: orange;}
   #purple {color: purple;}
   #gray {color: gray;}
   ]]></style>
  </head>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-computed-005.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule and overflow inside (complex test)</title>
+  <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-03 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-count-computed-003-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be partially clipped and should overlap partially with the 1st -moz-column-rule." />
+  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be partially clipped and should overlap partially with the 1st column-rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,66 +20,66 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 13em;
 
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.5em;
-  -moz-column-width: 1em;
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
+  column-width: 1em;
   }
 
   /*
-  (15)  if (-moz-column-width != auto) and (-moz-column-count = auto) then
-  (16)    N := max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
-  (17)    W := ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  (15)  if (column-width != auto) and (column-count = auto) then
+  (16)    N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
+  (17)    W := ((available-width + column-gap) / N) - column-gap;
   (18)  exit;
 
-  N := max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
   N == max(1, floor((13em + 5em) / (1em + 5em)));
   N == max(1, floor(18em / 6em));
   N == max(1, floor(3));
   N == 3;
 
-  So, the used -moz-column-count in this test is 3.
+  So, the used column-count in this test is 3.
 
-  W := ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W := ((available-width + column-gap) / N) - column-gap;
   W == ((13em + 5em) / 3) - 5em;
   W == ((18em) / 3) - 5em;
   W == (6em) - 5em;
   W == 1em;
 
-  So, the used -moz-column-width in this test is 1em.
+  So, the used column-width in this test is 1em.
   */
 
   #pink {color: pink;}
   #orange {color: orange;}
   #purple {color: purple;}
   #gray {color: gray;}
 
   /*
   Since
   "
   content that extends outside column boxes visibly overflows and is not clipped to the column box
   "
   http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
   this causes the right-half (0.5em) of the 'K' glyph to
-  overlap with the right-half (0.75em) of the 1st blue -moz-column-rule.
+  overlap with the right-half (0.75em) of the 1st blue column-rule.
   Same thing should happen to the 'N' glyph of 'ORAN'.
 
   Because no inline content should be rendered into the
   3rd column box, this causes the 2nd column rule not
   been rendered because
   "
-  Column rules are only drawn between two -moz-columns that
+  Column rules are only drawn between two columns that
   both have content.
   "
   http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
   */
   ]]></style>
  </head>
 
  <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-negative-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: negative '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: negative 'column-count' value</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified negative '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified negative 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: -1;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: -1;
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-negative-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-negative-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: zero '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: zero 'column-count' value</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified 0 '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified 0 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 0; /* invalid; must be a greater-than-zero integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 0; /* invalid; must be a greater-than-zero integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 2.1; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 2.1; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 1.9; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 1.9; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-count-non-integer-003.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
+  <title>CSS Multi-column Layout Test: non-integer 'column-count' value</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '&lt;integer&gt;' type" />
   <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
+  <meta name="assert" content="This test checks that a specified real 'column-count' value is invalid and ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,19 +20,19 @@
   background: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-count: 4;
-  -moz-column-count: 2.0; /* invalid; must be an integer */
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-count: 2.0; /* invalid; must be an integer */
+  column-gap: 0;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-000.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-fill: balance (basic)</title>
+  <title>CSS Multi-column Layout Test: column-fill: balance (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that content is balanced into all -moz-columns thanks to '-moz-column-fill: balance'." />
+  <meta name="assert" content="This test checks that content is balanced into all columns thanks to 'column-fill: balance'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div.test, table#reference
@@ -21,19 +21,19 @@
   color: lime;
   margin: 1em 0em;
   font: 1.25em/1 Ahem;
   width: 18em;
   }
 
   div.test
   {
-  -moz-columns: 3;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 3;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 3;
 
   W == 6em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-fill: balance with set height (basic)</title>
+  <title>CSS Multi-column Layout Test: column-fill: balance with set height (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that content is balanced into all -moz-columns of a multi-column element with a set height thanks to '-moz-column-fill: balance'." />
+  <meta name="assert" content="This test checks that content is balanced into all columns of a multi-column element with a set height thanks to 'column-fill: balance'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test, table#reference
@@ -22,19 +22,19 @@
   font: 1.25em/1 Ahem;
   height: 5em;
   margin: 1em 0em;
   width: 20em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 2;
 
   W == 10em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-001.xht
@@ -1,37 +1,37 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-fill: auto' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-30 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-auto-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-fill: auto' fills the column boxes of a multi-colum element sequentially with inline content and does not bother about balancing content of column boxes." />
+  <meta name="assert" content="This test checks that 'column-fill: auto' fills the column boxes of a multi-colum element sequentially with inline content and does not bother about balancing content of column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: black;
   font: 1.25em/1 Ahem;
   height: 10em;
   orphans: 1;
   widows: 1;
   width: 32em;
 
-  -moz-column-count: 3;
-  -moz-column-fill: auto;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-fill: auto;
+  column-gap: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>1 22 333 4444 55555 666666 7777777 999999999 1 22 333 4444 55555 666666 7777777 999999999 1 22 333 4444 55555 666666 7777777 999999999</div>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-002-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-002-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-fill-auto</title>
+<title>multicolumn | column-fill-auto</title>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: auto;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: auto;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-002.xht
@@ -1,14 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-fill-auto</title>
-<meta name="assert" content="This test checks that -moz-columns are not balanced when '-moz-column-fill: auto' is set"/>
+<title>multicolumn | column-fill-auto</title>
+<meta name="assert" content="This test checks that columns are not balanced when 'column-fill: auto' is set"/>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-auto-002-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -23,19 +23,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: auto;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: auto;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-003.xht
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-fill: auto' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' (basic)</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-01 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 '-moz-column-fill'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cf" title="7.1 'column-fill'" />
   <link rel="match" href="multicol-fill-auto-003-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks if inline content fills column boxes sequentially when '-moz-column-fill' is set to 'auto'." />
+  <meta name="assert" content="This test checks if inline content fills column boxes sequentially when 'column-fill' is set to 'auto'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,20 +20,20 @@
   background-repeat: no-repeat;
   background-position: 2em 4em;
   border: green solid 1em;
   color: green;
   font: 1.25em/1 Ahem;
   height: 6em;
   width: 21em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 1em;
-  -moz-column-rule: yellow solid 1em;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 1em;
+  column-rule: yellow solid 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is <strong>no red</strong>.</p>
 
@@ -50,16 +50,16 @@ 123 56 890 123 56</div>
   |123 56 890|  |          |
   |123 56789 |  |          |
   |1 34567 90|  |          |
   |12 4567 90|  |          |
   ************  ************
 
   The digits are the green squares, the white squares
   are the blank white spaces. The yellow vertical stripe
-  represent both the -moz-column-gap and the -moz-column-rule.
+  represent both the column-gap and the column-rule.
   The "3" glyph at line 5 of 1st column box should be
   overlapping the red square.
 
   -->
 
  </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-001.xht
@@ -1,31 +1,31 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicol | -moz-column-span: all | -moz-column-fill: auto</title>
+<title>multicol | column-span: all | column-fill: auto</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-auto-block-children-ref.xht"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 html {
 	background: white;
 }
 body {
 	background: blue;
 	width: 1200px;
 	height: 492px;
-	-moz-column-count: 3;
-	-moz-column-gap: 2em;
-	-moz-column-fill: auto;
+	column-count: 3;
+	column-gap: 2em;
+	column-fill: auto;
 }
 h1 {
-	-moz-column-span: all;
+	column-span: all;
 	font-size: 2em;
 	height: 70px;
 }
 dl {
 	font-size: 70%;
 	color: blue;
 	padding: 5px 10px 3px;
 	margin: 0 0 15px;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-002.xht
@@ -1,39 +1,39 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-fill: auto' and '-moz-column-span: all' (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: auto' and 'column-span: all' (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pagination-and-overflow-outside-multicol" title="8.2. Pagination and overflow outside multicol elements" />
   <link rel="match" href="multicol-fill-auto-block-children-002-ref.xht" />
 
   <meta name="flags" content="" />
-  <meta name="assert" content="This test checks that if '-moz-column-fill' is set to 'auto' and a multicolumn element content is solely made of block container boxes, then it should fill column boxes sequentially with such content and, in this test, it should overflow outside of it. This test relies on the idea that a '-moz-column-span: all' element will occupy more space in a multi-column element than a '-moz-column-span: none' element, therefore reducing available space for content in column boxes." />
+  <meta name="assert" content="This test checks that if 'column-fill' is set to 'auto' and a multicolumn element content is solely made of block container boxes, then it should fill column boxes sequentially with such content and, in this test, it should overflow outside of it. This test relies on the idea that a 'column-span: all' element will occupy more space in a multi-column element than a 'column-span: none' element, therefore reducing available space for content in column boxes." />
   <style type="text/css"><![CDATA[
   html {background-color: white;}
 
   body
   {
   background-color: blue;
   height: 200px;
   margin: 8px;
   width: 60%;
 
-  -moz-column-count: 3;
-  -moz-column-fill: auto;
-  -moz-column-gap: 10px;
+  column-count: 3;
+  column-fill: auto;
+  column-gap: 10px;
   }
 
   h1
   {
   color: white;
-  -moz-column-span: all;
+  column-span: all;
   font-size: 2em;
   line-height: 1.25; /* or 1.21875 to achieve a 39px tall line box */
   margin: 21px 0em;
   /*
    21px : margin-top of h1 element which must not collapse with body's margin-top
    80px : content height: 2 line boxes required to render the "Test passes if ..." sentence
    21px : margin-bottom of h1 element
  ====================================
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-auto-block-children-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicol | -moz-column-span: all | -moz-column-fill: auto</title>
+<title>multicol | column-span: all | column-fill: auto</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 html {
 	background: white;
 }
 body {
 	background: blue;
 	width: 1200px;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-001-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-fill</title>
+<title>multicolumn | column-fill</title>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: balance;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: balance;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-001.xht
@@ -1,14 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-fill</title>
-<meta name="assert" content="This test checks that -moz-columns are properly balanced when '-moz-column-fill: balance' is set"/>
+<title>multicolumn | column-fill</title>
+<meta name="assert" content="This test checks that columns are properly balanced when 'column-fill: balance' is set"/>
 <link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
 <link rel="match" href="multicol-fill-balance-001-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -23,19 +23,19 @@ body>div {
 	height: 3em;
 	width: 2em;
 	orphans: 1;
 	widows: 1;
 	position: relative;
 	margin: 1em;
 }
 div.col {
-	-moz-column-count: 2;
-	-moz-column-fill: balance;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-fill: balance;
+	column-gap: 0;
 }
 div.red {
 	background: red; position: absolute; z-index: -1;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-002.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-fill-balance-002.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<title>CSS Multi-column Layout Test: Balancing with more forced breaks than -moz-columns</title>
+<title>CSS Multi-column Layout Test: Balancing with more forced breaks than columns</title>
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
-<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf" title="7.1. -moz-column-fill">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf" title="7.1. column-fill">
 <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="This multicol container will create overflowing -moz-columns, no matter what, due to forced break. Don't overstretch.">
+<meta name="assert" content="This multicol container will create overflowing columns, no matter what, due to forced break. Don't overstretch.">
 <p>Test passes if there is a filled green square.</p>
-<div style="-moz-columns:2; -moz-column-gap:0; width:100px; background:green;">
+<div style="columns:2; column-gap:0; width:100px; background:green;">
   <div style="height:100px;"></div>
   <div style="break-before:column; height:90px;"></div>
   <div style="break-before:column; height:10px;"></div>
 </div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-000.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-gap (basic)</title>
+  <title>CSS Multi-column Layout Test: column-gap (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap'" />
   <link rel="match" href="multicol-gap-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that column gap appears between two -moz-columns." />
+  <meta name="assert" content="This test checks that column gap appears between two columns." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -23,18 +23,18 @@
   }
 
   div#test
   {
   background-color: yellow;
   orphans: 1;
   widows: 1;
 
-  -moz-column-width: 10em;
-  -moz-column-gap: 10em;
+  column-width: 10em;
+  column-gap: 10em;
   }
 
   span {color: yellow;}
   ]]></style>
  </head>
  <body>
 
   <p>Test passes if the 2 horizontal bars are <strong>identical</strong>.</p>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-gap: normal'</title>
+  <title>CSS Multi-column Layout Test: 'column-gap: normal'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-001-ref.xht" />
   <meta name="flags" content="ahem may" />
   <meta name="assert" content="This test checks that the 'normal' column gap is 1em, which is suggested -- and not prescribed -- by the specification." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -23,18 +23,18 @@
   margin: 1em;
   orphans: 1;
   widows: 1;
   width: 3em;
   }
 
   div.multicol
   {
-  -moz-column-gap: normal;
-  -moz-column-width: 1em;
+  column-gap: normal;
+  column-width: 1em;
   }
 
   span {padding-right: 1em;}
   ]]></style>
  </head>
  <body>
   <p>Test passes if the 2 stripes are <strong>identical</strong>.</p>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-gap (basic)</title>
+  <title>CSS Multi-column Layout Test: column-gap (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-003.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-gap: normal'</title>
+  <title>CSS Multi-column Layout Test: 'column-gap: normal'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem may" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: normal;
+  column-count: 4;
+  column-gap: normal;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-fraction-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-gap' with increasing values</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with increasing values</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-fraction-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -17,25 +17,25 @@
   div
   {
   background-color: gray;
   font: 1.25em/1 Ahem;
   width: 14.5em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 0.5em;
+  column-count: 2;
+  column-gap: 0.5em;
   }
 
-  #two {-moz-column-gap: 2.5em;}
+  #two {column-gap: 2.5em;}
 
-  #three {-moz-column-gap: 4.5em;}
+  #three {column-gap: 4.5em;}
 
-  #four {-moz-column-gap: 6.5em;}
+  #four {column-gap: 6.5em;}
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
 
   <div id="one">
 	blac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-fraction-002.html
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-fraction-002.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
-<title>CSS Multi-column Layout Test: '-moz-column-gap' with sub-pixel values</title>
+<title>CSS Multi-column Layout Test: 'column-gap' with sub-pixel values</title>
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'">
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'">
 <link rel="match" href="../reference/nothing.html" />
-<meta name="assert" content="Specified -moz-column-gap should never be rounded up to the nearest integer, or the second column in the tests might overflow the multicol container in the inline direction.">
+<meta name="assert" content="Specified column-gap should never be rounded up to the nearest integer, or the second column in the tests might overflow the multicol container in the inline direction.">
 <style>
-  .multicol { margin:10px; float:left; -moz-columns:2; width:50px; -moz-column-gap:10.9px; -moz-column-fill:auto; height:50px; background:white; }
+  .multicol { margin:10px; float:left; columns:2; width:50px; column-gap:10.9px; column-fill:auto; height:50px; background:white; }
   .filler { height:50px; }
   .below-everything { position:relative; z-index:-1; float:right; width:20px; height:20px; background:red; }
 </style>
 
 <p>There should be nothing below.</p>
 
-<div class="multicol" style="-moz-column-gap:10px;">
+<div class="multicol" style="column-gap:10px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.1px;">
+<div class="multicol" style="column-gap:10.1px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.2px;">
+<div class="multicol" style="column-gap:10.2px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.3px;">
+<div class="multicol" style="column-gap:10.3px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.4px;">
+<div class="multicol" style="column-gap:10.4px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.5px;">
+<div class="multicol" style="column-gap:10.5px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.6px;">
+<div class="multicol" style="column-gap:10.6px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.7px;">
+<div class="multicol" style="column-gap:10.7px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.8px;">
+<div class="multicol" style="column-gap:10.8px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:10.9px;">
+<div class="multicol" style="column-gap:10.9px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
 
-<div class="multicol" style="-moz-column-gap:11px;">
+<div class="multicol" style="column-gap:11px;">
   <div class="filler"></div>
   <div class="below-everything"></div>
 </div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-large-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-gap' with large value</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with large value</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap" />
   <link rel="match" href="multicol-gap-large-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that when '-moz-column-gap' is large and when used '-moz-column-width' is narrow, then content extends into -moz-column-gap and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
+  <meta name="assert" content="This test checks that when 'column-gap' is large and when used 'column-width' is narrow, then content extends into column-gap and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,31 +20,31 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 4em;
+  column-count: 4;
+  column-gap: 4em;
 
   /*
   N == 4;
   W == 0em;
   */
 
   /*
   In this test, the content of first 3 column
-  boxes extend into middle of -moz-column-gap and
+  boxes extend into middle of column-gap and
   content of the 4th column box extend outside the
   right edge of multi-column. The gray border-right of
   multi-column elemen overlaps partially the 3rd
-  -moz-column-gap.
+  column-gap.
   */
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-large-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-gap' with large value</title>
+  <title>CSS Multi-column Layout Test: 'column-gap' with large value</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap" />
   <link rel="match" href="multicol-gap-large-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 4em;
+  column-count: 2;
+  column-gap: 4em;
 
   /*
   N == 2;
   W == 3.5em;
   */
   }
 
   span {color: blue;}
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-gap-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-gap-negative-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-gap with negative value</title>
+  <title>CSS Multi-column Layout Test: column-gap with negative value</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-gap-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,19 +19,19 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-gap: -1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-gap: -1em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
 	bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-height-001.xht
@@ -1,36 +1,36 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and height</title>
+  <title>CSS Multi-column Layout Test: column-count and height</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
   <link rel="match" href="multicol-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that length of column rules is equal to the length of the -moz-columns and if a nth column box overflows outside the available width of a multi-column element, then an (n-1)th column rule should be drawn. In this test, a 3rd column box is created outside the content edge of the multi-column element: therefore, a 2nd blue column rule should be drawn accordingly." />
+  <meta name="assert" content="This test checks that length of column rules is equal to the length of the columns and if a nth column box overflows outside the available width of a multi-column element, then an (n-1)th column rule should be drawn. In this test, a 3rd column box is created outside the content edge of the multi-column element: therefore, a 2nd blue column rule should be drawn accordingly." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: white;
   font: 1.25em/1 Ahem;
   height: 8em;
   width: 14em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 2em;
-  -moz-column-rule: blue solid 10px;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 2em;
+  column-rule: blue solid 10px;
   }
   ]]></style>
  </head>
  <body>
   <p>Test passes if there are 2 blue vertical stripes of equal height.</p>
 
   <div>
   1st col 1st col 1st col
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-height-block-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-height-block-child-001.xht
@@ -18,40 +18,40 @@
   <style type="text/css"><![CDATA[
   div
   {
   background-color: blue;
   font: 20px/1 Ahem;
   height: 8em;
   width: 14em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6em;
 
   H == 8em;
 
   */
   }
 
   div#outer
   {
   color: black;
-  -moz-column-fill: auto;
+  column-fill: auto;
   }
 
   div#inner
   {
   color: orange;
-  -moz-column-fill: balance;
+  column-fill: balance;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="outer">
   bla bla bla bla bla
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-001-ref.xht
@@ -16,20 +16,20 @@
   }
 
   img
   {
   padding-right: 1em;
   vertical-align: top;
   }
 
-  img.-moz-column-gap {margin-right: 2em;}
+  img.column-gap {margin-right: 2em;}
 
   img#last {padding-right: 0em;}
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
 width="40" height="60" alt="Image download support must be enabled" /><img id="last" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /></div>
 
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-001.xht
@@ -17,18 +17,18 @@
   body
   {
   font: 1.25em/1 Ahem;
   width: 34em;
   }
 
   body > div
   {
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
 
   /*
   N == 3;
 
     34em : available width
   -  2em : horizontal margin of external div
   -  2em : 2 column gaps
  ==========
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-002-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-002-ref.xht
@@ -12,28 +12,28 @@
   font: 1.25em/1 serif;
   margin: 1em;
   padding: 0em 1em 1em;
   width: 30em;
   }
 
   img {vertical-align: top;}
 
-  img.-moz-column-gap
+  img.column-gap
   {
   margin-left: -2em;
   margin-right: 3em;
   vertical-align: bottom;
   }
 
   img#last
   {
   margin-left: -2em;
   vertical-align: bottom;
   }
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="-moz-column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="-moz-column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img id="last" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /></div>
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img  class="column-gap" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="20" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img id="last" src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /></div>
 
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-002.xht
@@ -1,31 +1,31 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-count' and inherit</title>
+  <title>CSS Multi-column Layout Test: 'column-count' and inherit</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-08 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
   <link rel="match" href="multicol-inherit-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' can be inherited by setting it with the CSS-wide keyword 'inherit'." />
+  <meta name="assert" content="This test checks that 'column-count' can be inherited by setting it with the CSS-wide keyword 'inherit'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
   background-color: blue;
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   font: 1.25em/1 Ahem;
   width: 32em;
 
   /*
   N == 3;
 
     32em
   -  2em : 2 column gaps
@@ -49,18 +49,18 @@
   margin: 1em;
   orphans: 1;
   widows: 1;
   }
 
   div > div
   {
   background-color: yellow;
-  -moz-column-count: inherit;
-  -moz-column-gap: 1em;
+  column-count: inherit;
+  column-gap: 1em;
   }
 
   div > div:first-child {margin-top: 0;}
   ]]></style>
  </head>
  <body>
 
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-inherit-003.xht
@@ -14,17 +14,17 @@
 }
 ]]></style>
 <style type="text/css"><![CDATA[
 body {
 	width: 75em;
 }
 body>div {
 	height: 2em;
-	-moz-column-width: 8em;
+	column-width: 8em;
 }
 div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;
 	background: yellow;
 	orphans: 1;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-list-item-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-list-item-001.xht
@@ -18,18 +18,18 @@
   ul
   {
   background-color: black;
   font: 1.25em/1 Ahem;
   margin: 0em;
   padding: 0em;
   width: 10em;
 
-  -moz-column-gap: 0em;
-  -moz-column-width: 5em;
+  column-gap: 0em;
+  column-width: 5em;
   }
 
   li, span {font-size: 1em;}
 
   li
   {
   margin-left: 1em;
   padding: 0em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-margin-001.xht
@@ -2,36 +2,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column and margin collapsing of first child (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-10 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that the margin-top of the first child of a multi-column element (with -moz-column-fill: auto) does not collapse with its parent." />
+  <meta name="assert" content="This test checks that the margin-top of the first child of a multi-column element (with column-fill: auto) does not collapse with its parent." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test-multi-column-red
   {
   background-color: red;
   color: white;
   font: 3.125em/1 Ahem; /* equivalent to 50px/50px Ahem */
   height: 4em;
   margin-top: 0em;
   width: 4em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: auto;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: auto;
+  column-gap: 0em;
   }
 
   div#first-child {margin-top: 2em;}
 
   div#reference-overlapping-green
   {
   background-color: green;
   bottom: 200px;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-margin-002.xht
@@ -2,36 +2,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column and margin collapsing of first child (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-10 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that the margin-top of the first child (an inline-block) of a multi-column element (with -moz-column-fill: balance) does not collapse with its parent." />
+  <meta name="assert" content="This test checks that the margin-top of the first child (an inline-block) of a multi-column element (with column-fill: balance) does not collapse with its parent." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#test-multi-column-red
   {
   background-color: red;
   color: white;
   font: 3.125em/1 Ahem; /* equivalent to 50px/50px Ahem */
   height: 4em;
   margin-top: 0em;
   width: 4em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 0em;
   }
 
   span
   {
   display: inline-block;
   margin-top: 2em;
   }
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-margin-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-margin-child-001.xht
@@ -18,19 +18,19 @@
   div
   {
   background-color: yellow;
   border: gray solid 1em;
   color: blue;
   font: 1.25em/1 Ahem;
   width: 10em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 0em;
   }
 
   h4
   {
   font: inherit;
   margin: 1em 0;
   }
   ]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-002.xht
@@ -17,30 +17,30 @@
   <style type="text/css"><![CDATA[
   body {margin: 0em;}
 
   body > div
   {
   font: 1.25em/1 Ahem;
   width: 32em;
 
-  -moz-column-gap: 1em;
-  -moz-column-width: 8em;
+  column-gap: 1em;
+  column-width: 8em;
   }
 
   /*
 
-  N == max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  N == max(1, floor((available-width + column-gap) / (column-width + column-gap)));
   N == max(1, floor((32em + 1em) / (8em + 1em)));
   N == max(1, floor(33em / 9em));
   N == max(1, floor(3.6));
   N == max(1, 3);
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   */
 
   div
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-005-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-005-ref.xht
@@ -16,20 +16,20 @@
   }
 
   img
   {
   padding-right: 2em;
   vertical-align: top;
   }
 
-  img.-moz-column-gap {margin-right: 2em;}
+  img.column-gap {margin-right: 2em;}
 
   img#last {padding-right: 0em;}
   ]]></style>
  </head>
  <body>
 
-  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="-moz-column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
+  <div><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img class="column-gap" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="60" alt="Image download support must be enabled" /><img src="support/black20x20.png"
 width="40" height="60" alt="Image download support must be enabled" /><img id="last" src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /></div>
 
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-005.xht
@@ -18,26 +18,26 @@
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
-  -moz-column-gap: 1em;
+  column-gap: 1em;
   font: 1.25em/1 Ahem;
   width: 41em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
   The height of column rule depends on number of line boxes in
@@ -47,17 +47,17 @@
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   So, each duo of 'a', 'm' and 'x' should fill one and only 1 line
@@ -73,17 +73,17 @@
   {
   background-color: yellow;
   color: black;
   font-size: 1em;
   margin: 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
+  column-count: 3;
   }
 
   div > div:first-child {margin-top: 0;}
   ]]></style>
  </head>
 
  <body>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-column-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-column-rule-001.xht
@@ -1,64 +1,64 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <!--
   This test's original filename was multicol-inherit-004.xht
   and it has been modified and is now
   multicol-nested-column-rule-001.xht
   -->
-  <title>CSS Multi-column Layout Test: nested multi-columns and -moz-column-rule position</title>
+  <title>CSS Multi-column Layout Test: nested multi-columns and column-rule position</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-09 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="multicol-nested-column-rule-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks how the height of column boxes conditions the height of column rule." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
-  -moz-column-rule: blue solid 1em;
+  column-rule: blue solid 1em;
   font: 1.25em/1 Ahem;
   width: 26em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (26em - ((3 - 1) * 1em)) / 3);
   W == max(0, (26em - (2 * 1em)) / 3);
   W == max(0, (26em - 2em) / 3);
   W == max(0, 24em / 3);
   W == max(0, 8em);
   W == 8em;
 
-  So, the first -moz-column-rule should be at:
+  So, the first column-rule should be at:
 
     1.0em : margin-left of outer div
     8.0em : width of 1st column box
-    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 1st -moz-column-rule
+    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 1st column-rule
   =========
     9.0em
 
-  The 2nd -moz-column-rule should be at:
+  The 2nd column-rule should be at:
 
     1.0em : margin-left of outer div
     8.0em : width of 1st column box
     1.0em : first -moz-column-gap
     8.0em : width of 2nd column box
-    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 2nd -moz-column-rule
+    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 2nd column-rule
   =========
    18.0em
 
   The height of column rule depends on number of line boxes in
   each outer column box which depends on number of line boxes
   in each inner column box. So:
 
      8em : width of each outer column box
@@ -90,18 +90,18 @@
   {
   background-color: white;
   color: white;
   font-size: 1em;
   margin: 0em 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-001.xht
@@ -17,25 +17,25 @@
   <style type="text/css"><![CDATA[
   body {margin: 0em;}
 
   body > div
   {
   font: 1.25em/1 Ahem;
   width: 32em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   */
 
   div
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-002.xht
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: nested multi-moz-columns and vertical margin (complex)</title>
+  <title>CSS Multi-column Layout Test: nested multicolumns and vertical margin (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />  <!-- 2013-08-14 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" title="2. The multi-column model" />
   <link rel="match" href="multicol-nested-margin-002-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that when an inner nested multi-column element is preceded by a soft column break (caused by an unforced column-break), then the used margin-top of such inner nested multi-column element is '0'." />
 
   <!--
@@ -36,33 +36,33 @@
 
   div
   {
   color: yellow;
   font: inherit;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0em 1em;}
 
   div div:last-child
   {
   color: blue;
   margin: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
   The height of column rule depends on number of line boxes in
@@ -72,17 +72,17 @@
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   So, each duo of 'a', 'm' and 'x' should fill one and only 1
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-003.xht
@@ -28,43 +28,43 @@
   div
   {
   background-color: yellow;
   color: black;
   margin: 1em 1em 0;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   /*
 
   N == 3;
 
   43em - 2em (horizontal margins) == available-width
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-004.xht
@@ -28,47 +28,47 @@
   div
   {
   background: yellow;
   color: black;
   margin: 1em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0 1em;}
 
   div div:first-child {margin: 1em 1em 0;}
 
   /*
 
   N == 3;
 
   43em - 2em (horizontal margins) == available-width
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-nested-margin-005.xht
@@ -28,45 +28,45 @@
   div
   {
   background: yellow;
   color: black;
   margin: 1em 1em 0em;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
+  column-count: 3;
+  column-gap: 1em;
   }
 
   div div {margin: 0 1em;}
 
   div div:first-child {margin: 1em 1em 0;}
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (41em - ((3 - 1) * 1em)) / 3);
   W == max(0, (41em - (2 * 1em)) / 3);
   W == max(0, (41em - 2em) / 3);
   W == max(0, 39em / 3);
   W == max(0, 13em);
   W == 13em;
 
     13em : width of each outer column box
    -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (11em - ((3 - 1) * 1em)) / 3);
   W == max(0, (11em - (2 * 1em)) / 3);
   W == max(0, (11em - 2em) / 3);
   W == max(0, 9em / 3);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-overflow-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-overflow-000.xht
@@ -2,17 +2,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column with set height causing overflow outside (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pagination-and-overflow-outside-multicol" title="8.2. Pagination and overflow outside multicol elements" />
   <link rel="match" href="multicol-overflow-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that column gap appears between two -moz-columns." />
+  <meta name="assert" content="This test checks that column gap appears between two columns." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div, table
@@ -20,19 +20,19 @@
   background-color: yellow;
   color: lime;
   font: 1.25em/1 Ahem;
   margin: 1em 0;
   }
 
   div
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0px;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0px;
   height: 2em;
   width: 20em;
   }
 
   table
   {
   border-right: lime solid 1em;
   border-spacing: 0px;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-overflowing-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-overflowing-001.xht
@@ -21,30 +21,30 @@
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
   {
   font: 1.25em/1 Ahem;
   height: 2em;
   width: 32em;
 
-  -moz-column-gap: 1em;
-  -moz-column-width: 8em;
+  column-gap: 1em;
+  column-width: 8em;
   }
 
   /*
 
-  N == max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
+  N == max(1, floor((available-width + column-gap) / (column-width + column-gap)));
   N == max(1, floor((32em + 1em) / (8em + 1em)));
   N == max(1, floor(33em / 9em));
   N == max(1, floor(3.6));
   N == max(1, 3);
   N == 3;
 
-  W == ((available-width + -moz-column-gap) / N) - -moz-column-gap;
+  W == ((available-width + column-gap) / N) - column-gap;
   W == ((32em + 1em) / 3) - 1em;
   W == (33em / 3) - 1em;
   W == (11em) - 1em;
   W == 10em;
 
   H == 2em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-reduce-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-reduce-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: column width becomes wider to fill available space</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1 '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1 'column-width'" />
   <link rel="match" href="multicol-reduce-000-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that column width is increased to fill the available space: in this test, there are only 2 column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -22,29 +22,29 @@
   color: orange;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 30em;
   }
 
   div#test
   {
-  -moz-column-gap: 0;
-  -moz-column-width: 201px;
+  column-gap: 0;
+  column-width: 201px;
 
   /*
 
-  N == max(1, floor((U + -moz-column-gap)/(-moz-column-width + -moz-column-gap)))
+  N == max(1, floor((U + column-gap)/(column-width + column-gap)))
   N == max(1, floor((600px + 0px)/(201px + 0)))
   N == max(1, floor(600px/201px))
   N == max(1, floor(2.985))
   N == max(1, 2)
   N == 2;
 
-  W == max(0, ((U + -moz-column-gap)/N - -moz-column-gap))
+  W == max(0, ((U + column-gap)/N - column-gap))
   W == max(0, ((600px + 0px)/2 - 0px))
   W == max(0, ((600px)/2 - 0px))
   W == max(0, (300px - 0px))
   W == max(0, 300px)
   W == 300px;
 
   */
   }
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,19 +19,19 @@
   color: black;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 602px;
   }
 
   div#test
   {
-  -moz-columns: 3;
-  -moz-column-gap: 1px;
-  -moz-column-rule: lime solid 1px;
+  columns: 3;
+  column-gap: 1px;
+  column-rule: lime solid 1px;
 
   /*
 
   N == 3;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-001.xht
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule exceeding -moz-column-gap</title>
+  <title>CSS Multi-column Layout Test: column-rule exceeding column-gap</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="If a column rule is wider than its gap, then the adjacent column boxes overlap the rule. This test checks that if inline content of column boxes uses only 1 twentieth (1/20) of each of the adjacent column box width, then the column rule must shine through 19 twentieths (19/20) of each of the adjacent column boxes (and above their respective backgrounds)." />
 <style type="text/css"><![CDATA[
 @font-face {
@@ -21,19 +21,19 @@
   color: green;
   font: 1.25em/1 Ahem;
   margin-bottom: 0.5em;
   width: 20em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0em;
-  -moz-column-rule: green solid 20em;
+  columns: 2;
+  column-gap: 0em;
+  column-rule: green solid 20em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-002.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -25,18 +25,18 @@ body>div {
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	position: relative;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
+	column-count: 4;
+	column-gap: 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-003.xht
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-003-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
@@ -19,21 +19,21 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
   1s cl
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-004.xht
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-fill: balance' and -moz-column-rule</title>
+  <title>CSS Multi-column Layout Test: 'column-fill: balance' and column-rule</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-02 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
   <link rel="match" href="multicol-rule-004-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that when '-moz-column-fill: balance' distributes equally inline content into column boxes in a way that does not completely fill column boxes, then -moz-column-rule must nevertheless still be painted entirely, that is for the whole length of column boxes, even though the whole inline content may not fill the whole length of the column boxes." />
+  <meta name="assert" content="This test checks that when 'column-fill: balance' distributes equally inline content into column boxes in a way that does not completely fill column boxes, then column-rule must nevertheless still be painted entirely, that is for the whole length of column boxes, even though the whole inline content may not fill the whole length of the column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body {margin: 8px;}
@@ -36,20 +36,20 @@
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   height: 5em;
   position: relative;
   right: 80px;
   width: 13em;
 
-  -moz-column-count: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 5em;
-  -moz-column-rule: green solid 5em;
+  column-count: 2;
+  column-fill: balance;
+  column-gap: 5em;
+  column-rule: green solid 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule-color (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule-color (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-color-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -18,28 +18,28 @@
   {
   border: gray solid 1em;
   color: lime;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (14em - ((4 - 1) * 1em)) / 4);
   W == max(0, (14em - (3 * 1em)) / 4);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-inherit-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-inherit-001.xht
@@ -1,77 +1,77 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule-color: inherit</title>
+  <title>CSS Multi-column Layout Test: column-rule-color: inherit</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-02 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. 'column-rule-color'" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
   <link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case -moz-column-rule-color will be inherited from the parent's -moz-column-rule-color value." />
+  <meta name="assert" content="This test checks that, by default, column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case column-rule-color will be inherited from the parent's column-rule-color value." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#parent
   {
-  -moz-column-rule-color: green;
-  -moz-column-rule-style: none;
+  column-rule-color: green;
+  column-rule-style: none;
   font: 1.25em/1 Ahem;
   width: 17em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (17em - ((3 - 1) * 1em)) / 3);
   W == max(0, (17em - (2 * 1em)) / 3);
   W == max(0, (17em - 2em) / 3);
   W == max(0, 15em / 3);
   W == max(0, 5em);
   W == 5em;
 
   The height of column rule depends on number of line boxes in
   each outer column box which depends on number of line boxes
   in each inner column box.
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (5em - ((3 - 1) * 1em)) / 3);
   W == max(0, (5em - (2 * 1em)) / 3);
   W == max(0, (5em - 2em) / 3);
   W == max(0, 3em / 3);
   W == max(0, 1em);
   W == 1em;
 
   */
 
   div
   {
   color: red; /* both div#parent and div.child have and use 'color: red' */
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
-  -moz-column-rule-width: 1em;
+  column-count: 3;
+  column-gap: 1em;
+  column-rule-width: 1em;
   }
 
   div.child
   {
-  -moz-column-rule-color: inherit;
-  -moz-column-rule-style: solid;
+  column-rule-color: inherit;
+  column-rule-style: solid;
   font-size: 1em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there are 6 vertical green stripes and <strong>no red</strong>.</p>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-color-inherit-002.xht
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule-color: inherit (complex)</title>
+  <title>CSS Multi-column Layout Test: column-rule-color: inherit (complex)</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 and 2016-10-02 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. 'column-rule-color'" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
   <link rel="help" href="https://drafts.csswg.org/css-color-4/#currentcolor-color" title="5.2. The 'currentcolor' keyword" />
   <link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="In this test, div#parent's computed '-moz-column-rule-color' is given by div#parent's 'currentcolor' (a reserved keyword) and not 'red'. Then div.child's '-moz-column-rule-color' take such specified value ('currentcolor') from its parent (due to 'inherit' keyword) and not 'red'. And then, it is applied to div.child's '-moz-column-rule-color'." />
+  <meta name="assert" content="In this test, div#parent's computed 'column-rule-color' is given by div#parent's 'currentcolor' (a reserved keyword) and not 'red'. Then div.child's 'column-rule-color' take such specified value ('currentcolor') from its parent (due to 'inherit' keyword) and not 'red'. And then, it is applied to div.child's 'column-rule-color'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#parent
@@ -24,28 +24,28 @@
 
   div.child
   {
   color: green;
   display: inline-block;
   font-size: 1em;
   width: 5em;
 
-  -moz-column-count: 3;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: inherit;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1em;
+  column-count: 3;
+  column-gap: 1em;
+  column-rule-color: inherit;
+  column-rule-style: solid;
+  column-rule-width: 1em;
   }
 
   /*
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (5em - ((3 - 1) * 1em)) / 3);
   W == max(0, (5em - (2 * 1em)) / 3);
   W == max(0, (5em - 2em) / 3);
   W == max(0, 3em / 3);
   W == max(0, 1em);
   W == 1em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-dashed-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-dashed-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'dashed' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'dashed' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-dashed-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime dashed 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime dashed 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-dotted-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-dotted-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'dotted' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'dotted' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-dotted-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime dotted 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime dotted 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-double-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-double-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'double' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'double' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-double-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime double 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime double 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule-width</title>
+  <title>CSS Multi-column Layout Test: column-rule-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-fraction-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,28 +19,28 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 0.9em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 0.9em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (14em - ((4 - 1) * 1em)) / 4);
   W == max(0, (14em - (3 * 1em)) / 4);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: wide -moz-column-rule-width painted above background-color</title>
+  <title>CSS Multi-column Layout Test: wide column-rule-width painted above background-color</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-fraction-002-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes above the background of the multi-column element but below the inline content inside the multicol element. In this test, the blue -moz-column-rule is painted above the yellow background-color but below (under) the black Ahem glyphs." />
+  <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes above the background of the multi-column element but below the inline content inside the multicol element. In this test, the blue column-rule is painted above the yellow background-color but below (under) the black Ahem glyphs." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,28 +20,28 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 14em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 1.9em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.9em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (14em - ((4 - 1) * 1em)) / 4);
   W == max(0, (14em - (3 * 1em)) / 4);
   W == max(0, (14em - (3em)) / 4);
   W == max(0, (11em) / 4);
   W == max(0, 2.75em);
   W == 2.75em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-003.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-fraction-3-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -25,18 +25,18 @@ body>div {
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 14em;
 	position: relative;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
+	column-count: 4;
+	column-gap: 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 2.4em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-3-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-fraction-3-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-groove-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-groove-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'groove' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'groove' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-groove-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime groove 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime groove 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-hidden-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-hidden-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'hidden' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'hidden' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-hidden-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: red hidden 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: red hidden 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-inset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-inset-000.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'inset' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'inset' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-ridge-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'inset' value is drawn the same as 'ridge'." />
+  <meta name="assert" content="'border-style' values of column-rule are interpreted as in the collapsing border model in which case 'inset' value is drawn the same as 'ridge'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,19 +21,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime inset 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime inset 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-large-001.xht
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: excessively wide -moz-column-rule-width</title>
+  <title>CSS Multi-column Layout Test: excessively wide column-rule-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
-  <link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Sep/0006.html" title="[css3-multicol] z-order of -moz-column-rule: below or above border?" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
+  <link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Sep/0006.html" title="[css3-multicol] z-order of column-rule: below or above border?" />
   <link rel="match" href="multicol-rule-large-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes; its painting will be above background of multi-column element but below the inline content inside the multicol element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -27,28 +27,28 @@
   background-color: red;
   border: gray solid 1em;
   color: lime;
   font-size: 1em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: blue;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 17em;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 17em;
   }
 
   /*
 
   N == 4;
 
-  W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
+  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (15em - ((4 - 1) * 1em)) / 4);
   W == max(0, (15em - (3 * 1em)) / 4);
   W == max(0, (15em - (3em)) / 4);
   W == max(0, (12em) / 4);
   W == max(0, 3em);
   W == 3em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-none-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-none-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'none' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'none' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-hidden-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: red none 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: red none 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-outset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-outset-000.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'outset' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'outset' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-groove-000-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'outset' value is drawn the same as 'groove'." />
+  <meta name="assert" content="'border-style' values of column-rule are interpreted as in the collapsing border model in which case 'outset' value is drawn the same as 'groove'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,19 +21,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime outset 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime outset 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-percent-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-percent-001.xht
@@ -1,37 +1,37 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule-width and percentage unit (basic)</title>
+  <title>CSS Multi-column Layout Test: column-rule-width and percentage unit (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-containing-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that the -moz-column-rule-width property does not accept percentage unit in its values." />
+  <meta name="assert" content="This test checks that the column-rule-width property does not accept percentage unit in its values." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   color: green;
   font: 1.25em/1 Ahem;
   width: 19em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
-  -moz-column-rule-color: red;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 0;
-  -moz-column-rule-width: 200%;
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: red;
+  column-rule-style: solid;
+  column-rule-width: 0;
+  column-rule-width: 200%;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 4444 1&nbsp;&nbsp; 1&nbsp;&nbsp; 1&nbsp;&nbsp; 4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 4444 1&nbsp;&nbsp; 1&nbsp;&nbsp; 4444 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 4444 4444 1&nbsp;&nbsp; 1&nbsp;&nbsp; 4444 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 4444</div>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-px-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-px-001.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -24,21 +24,21 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule-color: blue;
-	-moz-column-rule-width: 16px;
-	-moz-column-rule-style: solid;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule-color: blue;
+	column-rule-width: 16px;
+	column-rule-style: solid;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 16px;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-ridge-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-ridge-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'ridge' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'ridge' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-ridge-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime ridge 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime ridge 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-samelength-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-samelength-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-rule-width' has same length as '-moz-column-gap'</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-width' has same length as 'column-gap'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-samelength-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -35,38 +35,38 @@
   {
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule-color: green;
-  -moz-column-rule-style: solid;
-  -moz-column-rule-width: 5em;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule-color: green;
+  column-rule-style: solid;
+  column-rule-width: 5em;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="red-overlapped-reference"></div>
 
   <div id="test-overlapping-green">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-rule' shorthand</title>
+  <title>CSS Multi-column Layout Test: 'column-rule' shorthand</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
   <link rel="match" href="multicol-rule-samelength-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -35,48 +35,48 @@
   {
   bottom: 100px;
   color: transparent;
   font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
   position: relative;
   right: 40px;
   width: 9em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 5em;
-  -moz-column-rule: green solid 5em;
-  -moz-column-rule: normal red 5em;
-  -moz-column-rule: normal 5em red;
-  -moz-column-rule: red normal 5em;
-  -moz-column-rule: red 5em normal;
-  -moz-column-rule: 5em normal red;
-  -moz-column-rule: 5em red normal;
-  -moz-column-rule: red 5em red solid;
-  -moz-column-rule: red 5em solid red;
-  -moz-column-rule: red solid 5em red;
-  -moz-column-rule: red solid red 5em;
-  -moz-column-rule: 5em red solid red;
-  -moz-column-rule: solid red 5em red;
+  column-count: 2;
+  column-gap: 5em;
+  column-rule: green solid 5em;
+  column-rule: normal red 5em;
+  column-rule: normal 5em red;
+  column-rule: red normal 5em;
+  column-rule: red 5em normal;
+  column-rule: 5em normal red;
+  column-rule: 5em red normal;
+  column-rule: red 5em red solid;
+  column-rule: red 5em solid red;
+  column-rule: red solid 5em red;
+  column-rule: red solid red 5em;
+  column-rule: 5em red solid red;
+  column-rule: solid red 5em red;
   }
   ]]></style>
  </head>
 
  <body>
 
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="red-overlapped-reference"></div>
 
   <div id="test-overlapping-green">Le ft Co lu mn Ri gh Co lu mn</div>
 
   <!--
 
   Expected results
-    -moz-column-gap
-    -moz-column-rule
+    column-gap
+    column-rule
      v=====v
   *************
   |Le|     |Ri|
   |ft|     |gh|
   |Co|     |Co|
   |lu|     |lu|
   |mn|     |mn|
   *************
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-2-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-2-ref.xht
@@ -1,11 +1,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-2.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-shorthand-2.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href=""/>
 <link rel="match" href="multicol-rule-shorthand-2-ref.xht"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
@@ -18,20 +18,20 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule: solid blue 1em;
-	-moz-column-rule: normal red 1em;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule: solid blue 1em;
+	column-rule: normal red 1em;
 	column: normal red 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-solid-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-solid-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'solid' border style</title>
+  <title>CSS Multi-column Layout Test: column-rule shorthand with 'solid' border style</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-rule-solid-000-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,19 +20,19 @@
   color: black;
   font: 3.125em/1 Ahem;
   margin-bottom: 0.2em;
   width: 8.2em;
   }
 
   div#test
   {
-  -moz-columns: 2;
-  -moz-column-gap: 0.2em;
-  -moz-column-rule: lime solid 0.2em;
+  columns: 2;
+  column-gap: 0.2em;
+  column-rule: lime solid 0.2em;
 
   /*
 
   N == 2;
 
   W == 200px;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-stacking-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-stacking-001.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-count, stacking</title>
+<title>multicolumn | column-count, stacking</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
 <link rel="match" href="multicol-rule-stacking-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -24,19 +24,19 @@ body>div {
 	color: blue;
 	background: red;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 14em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule: 28em solid blue;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule: 28em solid blue;
 }
 span {
 	color: black;
 	position: relative;
 	z-index: 1;
 }
 ]]></style>
 </head>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-rule-stacking-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-rule-stacking-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-rule</title>
+<title>multicolumn | column-rule</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-shorthand-001.xht
@@ -24,21 +24,21 @@ body>div {
 	color: black;
 	background: yellow;
 	margin: 1em;
 	border: 1em solid gray;
 	width: 15em;
 	orphans: 1;
 	widows: 1;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 1em;
-	-moz-column-rule: solid blue 1em;
+	column-count: 4;
+	column-gap: 1em;
+	column-rule: solid blue 1em;
 	column: normal red 1em;
-	-moz-columns: normal red 1em;
+	columns: normal red 1em;
 }
 span {
 	background: blue;
 	position: absolute;
 	top: 0;
 	left: 3em;
 	height: 2em;
 	width: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-000.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-span (basic)</title>
+  <title>CSS Multi-column Layout Test: column-span (basic)</title>
   <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
   <link rel="match" href="multicol-span-000-ref.xht" />
   <meta name="flags" content="ahem image" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -21,49 +21,49 @@
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 10em;
   }
 
   div#test, div.test2
   {
-  -moz-columns: 2;
-  -moz-column-fill: balance;
-  -moz-column-gap: 0em;
+  columns: 2;
+  column-fill: balance;
+  column-gap: 0em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
   }
 
   div#test, div#reference {margin-bottom: 0.5em;}
 
   div#column-span
   {
-  -moz-column-span: all;
+  column-span: all;
   font: inherit;
   }
 
   img
   {
   padding-right: 4em;
   vertical-align: top;
   }
   ]]></style>
  </head>
  <body>
 
   <p>Test passes if the 3 rectangles are <strong>identical</strong>.</p>
 
-  <div id="test">A<br />B<div id="-moz-column-span">123456</div>C<br />D</div>
+  <div id="test">A<br />B<div id="column-span">123456</div>C<br />D</div>
 
   <div id="reference"><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><br /><img src="support/swatch-lime.png" width="120" height="20" alt="Image download support must be enabled" /><br /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="20" height="20" alt="Image download support must be enabled" /></div>
 
   <div class="test2">A<br />B</div>
   <div>123456</div>
   <div class="test2">C<br />D</div>
 
  </body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span' element (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-span' element (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 1em;
+  column-count: 4;
+  column-gap: 1em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -43,17 +43,17 @@
 
   h4
   {
   background-color: black;
   color: black;
   font: inherit;
   margin: 0;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
 
  <body>
 
   <div>
     <span id="top-first-and-second-columns"> bl ue bl ue </span>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span' element - large margin-left and 'overflow: hidden'</title>
+  <title>CSS Multi-column Layout Test: 'column-span' element - large margin-left and 'overflow: hidden'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -20,18 +20,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -44,21 +44,21 @@
 
   h4
   {
   background-color: black;
   color: black;
   font: inherit;
   margin: 1em 0 1em 8em;
 
-  -moz-column-span: all;
+  column-span: all;
   /*
   Since there is not sufficient space for the
   spanning element, UA may treat the element as
-  '-moz-column-span: none'; in which case,
+  'column-span: none'; in which case,
   'overflow: hidden' will take care of
   overflowed content out of multi-column box.
   */
   }
   ]]></style>
  </head>
 
  <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-003.xht
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span: all' (basic)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' (basic)</title>
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-03 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-count-002-ref.xht"/>
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-span: all' spans across all column boxes and that content in the normal flow (in this test, the '55555 55555 55555 55555') that appears before the element is automatically balanced across all -moz-columns before the element appears." />
+  <meta name="assert" content="This test checks that 'column-span: all' spans across all column boxes and that content in the normal flow (in this test, the '55555 55555 55555 55555') that appears before the element is automatically balanced across all columns before the element appears." />
 
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
@@ -25,26 +25,26 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
+  column-count: 4;
+  column-gap: 0;
   orphans: 1;
   widows: 1;
   }
 
   h4
   {
   background-color: black;
-  -moz-column-span: all;
+  column-span: all;
   color: yellow;
   font: 1em/1 Ahem;
   margin: 0em;
   }
   ]]></style>
  </head>
  <body>
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-block-sibling-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-block-sibling-003.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicol | -moz-column-span: all | block-level child</title>
+<title>multicol | column-span: all | block-level child</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
 <link rel="match" href="multicol-span-all-block-sibling-3-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -16,20 +16,20 @@
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;
 	background: black;
 
-	-moz-column-count: 2;
+	column-count: 2;
 }
 h1 {
-	-moz-column-span: all;
+	column-span: all;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 	<div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-block-sibling-3-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-block-sibling-3-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicol | -moz-column-span: all | block-level child</title>
+<title>multicol | column-span: all | block-level child</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
 	font-family: ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;
 	background: black;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span: all' element and width exceeding available multi-colum width (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element and width exceeding available multi-colum width (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-18 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-001-ref.xht" />
   <meta name="flags" content="ahem may" />
-  <meta name="assert" content="This test checks that when 'overflow' is set to 'hidden' on a multi-column element, then any spanning ('-moz-column-span: all') element exceeding the available width of the multi-column should be clipped accordingly." />
+  <meta name="assert" content="This test checks that when 'overflow' is set to 'hidden' on a multi-column element, then any spanning ('column-span: all') element exceeding the available width of the multi-column should be clipped accordingly." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2;
 
   */
@@ -41,17 +41,17 @@
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 1em 0;
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
 
   /*
   This is the target of the test: the spanning element's
   width (11em) exceeds the available width of the
   multi-column element. The 3em exceeding such
   width is first clipped at column box boundary.
   */
   }
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span: all' element</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2;
 
   */
@@ -52,17 +52,17 @@
   */
   }
 
   h4#black
   {
   background: black;
   color: black;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span {color: blue;}
 
   span + span {color: pink;}
   ]]></style>
  </head>
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-bottom-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-bottom-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: '-moz-column-span: all' element with vertical margins and width exceeding available multi-colum width (complex)</title>
+  <title>CSS Multi-column Layout Test: 'column-span: all' element with vertical margins and width exceeding available multi-colum width (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-bottom-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -42,17 +42,17 @@
   margin: 1em 0;
   }
 
   h4#black
   {
   background: black;
   color: black;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   h4#orange
   {
   background: orange;
   color: orange;
   /*
   In this test, the glyphs "or" are painted into 1st column box.
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: vertically adjacent spanning elements with nested margins (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-nested-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -46,17 +46,17 @@
   margin: 0;
   }
 
   h4
   {
   margin: 1em 0;
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="multi-column">
     na vy na vy
     na vy na vy
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: vertically adjacent spanning elements with nested margins (complex)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-nested-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the resulting (from a margin collapsing with its nested h4 element) of top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   orphans: 1;
   overflow: hidden;
   widows: 1;
   width: 8em;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0em;
+  column-count: 4;
+  column-gap: 0em;
 
   /*
 
   N == 4;
 
   W == 2em;
 
   */
@@ -47,17 +47,17 @@
   }
 
   div#child {margin: 1em 0 0;}
 
   h4
   {
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
   ]]></style>
  </head>
  <body>
 
   <div id="multi-column">
     na vy na vy
     na vy na vy
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-span</title>
+<title>multicolumn | column-span</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
 <link rel="match" href="multicol-span-all-margin-nested-firstchild-ref.xht"/>
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
@@ -26,34 +26,34 @@ body>div {
 	margin: 1em;
 	border: 1em solid gray;
 	width: 8em;
 	float: left;
 	orphans: 1;
 	widows: 1;
 	overflow: hidden;
 
-	-moz-column-count: 4;
-	-moz-column-gap: 0;
+	column-count: 4;
+	column-gap: 0;
 }
 span, h6 {
 	font-family: ahem;
 	font-size: 1em;
 	font-weight: normal;
 	line-height: 1em;
 	color: black;
 	background: black;
 	padding: 0;
 	margin: 0;
 	display: block;
 }
 h6 {
 	margin: 1em 0;
 	width: 11em;
-	-moz-column-span: all;
+	column-span: all;
 }
 span {
 	color: pink;
 	background: pink;
 	margin: 2em 0;
 }
 h6~h6 {
 	color: black;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-span</title>
+<title>multicolumn | column-span</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body {
 	margin: 0;
 }
 body>div {
 	font-family: ahem;
 	font-size: 1em;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-float-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-float-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: floating a column-spanning element</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-22 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-float-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-span' does not apply to floating element." />
+  <meta name="assert" content="This test checks that 'column-span' does not apply to floating element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   border: gray solid 1em;
   color: navy;
   font: 1.25em/1 Ahem;
   margin-left: 5em;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 1em;
+  column-count: 2;
+  column-gap: 1em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
@@ -40,17 +40,17 @@
 
   span
   {
   display: block;
   font: inherit;
   margin: 0;
   width: 11em;
 
-  -moz-column-span: all;
+  column-span: all;
   }
 
   span:first-child
   {
   background-color: pink;
   color: pink;
   float: right;
   }
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-span-none-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-span-none-001.xht
@@ -1,35 +1,35 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-span: none (basic)</title>
+  <title>CSS Multi-column Layout Test: column-span: none (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-22 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns" title="6.1. '-moz-column-span'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-none-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks how a '-moz-column-span: none' element is rendered: it should not span across all column boxes." />
+  <meta name="assert" content="This test checks how a 'column-span: none' element is rendered: it should not span across all column boxes." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   border: gray solid 1em;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 11em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 1em;
+  column-count: 2;
+  column-gap: 1em;
 
   /*
 
   N == 2;
 
   W == 5em;
 
   */
@@ -38,17 +38,17 @@
   h4
   {
   background: black;
   color: black;
   font: inherit;
   margin: 0;
   width: 11em;
 
-  -moz-column-span: none;
+  column-span: none;
   }
 
   #column1-top {color: blue;}
 
   #column1-bottom {color: orange;}
 
   #column2-top {color: pink;}
 
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-001.xht
@@ -1,36 +1,36 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and table-cell (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-table-cell-001-ref.xht"/>
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell'." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
   {
   background-color: red;
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 6;
-  -moz-column-gap: 0em;
+  column-count: 6;
+  column-gap: 0em;
   }
   ]]></style>
  </head>
  <body>
 
   <div>P<br />A<br />S<br />S<br />E<br />D</div>
 
  </body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-height-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and height of table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and height of table-cell (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-table-cell-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   height: 18em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6.5em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-height-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-height-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and height of table-cell (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and height of table-cell (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-table-cell-height-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height. A set height for a table-cell still remains the minimum height required by the content, even when its layout is influenced by, conditioned by a multi-column layout." />
+  <meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height. A set height for a table-cell still remains the minimum height required by the content, even when its layout is influenced by, conditioned by a multi-column layout." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -21,18 +21,18 @@
   color: black;
   display: table-cell;
   font: 1.25em/1 Ahem;
   height: 0em;
   orphans: 1;
   widows: 1;
   width: 15em;
 
-  -moz-column-count: 2;
-  -moz-column-gap: 2em;
+  column-count: 2;
+  column-gap: 2em;
 
   /*
 
   N == 2;
 
   W == 6.5em;
 
   */
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-vertical-align-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-table-cell-vertical-align-001.xht
@@ -20,18 +20,18 @@ div {
 	line-height: 1em;
 	vertical-align: middle;
 	color: white;
 	background: #3366CC;
 	width: 6em;
 	height: 20em;
 	display: table-cell;
 
-	-moz-column-count: 2;
-	-moz-column-gap: 0;
+	column-count: 2;
+	column-gap: 0;
 }
 ]]></style>
 </head>
 
 <body>
 
 <div>
 aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-width-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -22,18 +22,18 @@
 
   div
   {
   background-color: yellow;
   color: black;
   orphans: 1;
   widows: 1;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-gap: 0;
+  column-width: 6em;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-width-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -19,18 +19,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-gap: 0;
+  column-width: 6em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-003.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-width-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -21,18 +21,18 @@
   color: black;
   font: 1.25em/1 Ahem;
   height: 2em;
   orphans: 1;
   position: relative;
   widows: 1;
   width: 12em;
 
-  -moz-column-width: 6em;
-  -moz-column-gap: 0;
+  column-width: 6em;
+  column-gap: 0;
   }
 
   div > div
   {
   background-color: black;
   height: 2em;
   position: absolute;
   top: 0;
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-ch-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-ch-001.xht
@@ -1,23 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-width</title>
+<title>multicolumn | column-width</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
 <link rel="match" href="multicol-width-ch-ref.xht"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
 .multicol {
   font: 1em monospace;
   width: 69ch;
-  -moz-column-width: 13ch;
-  -moz-column-gap: 1ch;
+  column-width: 13ch;
+  column-gap: 1ch;
   orphans: 1;
   widows: 1;
   background: yellow;
 }
 ]]></style>
 </head>
 
 <body>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-ch-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-ch-ref.xht
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | -moz-column-width</title>
+<title>multicolumn | column-width</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 .multicol-ref {
   display: flow-root;
   width: 69ch;
   font: 1em monospace;
   background: yellow;
 }
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-count-001.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-width-001-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -22,19 +22,19 @@
 
   div
   {
   background-color: yellow;
   color: black;
   orphans: 1;
   widows: 1;
 
-  -moz-column-count: 5;
-  -moz-column-gap: 0;
-  -moz-column-width: 6em;
+  column-count: 5;
+  column-gap: 0;
+  column-width: 6em;
   }
   ]]></style>
  </head>
  <body>
   <div>
 	d da dam dame damer
 	d da dam dame damer
 	d da dam dame damer
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-count-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-count-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: -moz-column-count and -moz-column-width (basic)</title>
+  <title>CSS Multi-column Layout Test: column-count and column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem" />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
@@ -24,19 +24,19 @@
   width: 20em;
   }
 
   div
   {
   background-color: yellow;
   color: black;
 
-  -moz-column-count: 4;
-  -moz-column-gap: 0;
-  -moz-column-width: 5em;
+  column-count: 4;
+  column-gap: 0;
+  column-width: 5em;
   }
   ]]></style>
  </head>
  <body>
   <div>55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1 333 55555 55555 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1 22&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555 55555 1&nbsp;&nbsp;&nbsp; 1 333 1 333 1&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp; 55555
   </div>
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-invalid-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-invalid-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: invalid -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: invalid column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that '-moz-column-width: bzzt' is invalid (generating a parsing error) and therefore will be ignored." />
+  <meta name="assert" content="This test checks that 'column-width: bzzt' is invalid (generating a parsing error) and therefore will be ignored." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: bzzt;
+  column-gap: 0;
+  column-width: bzzt;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-large-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: large -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: large column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' may be wider (to fill the available space). In this test, the actual -moz-column-width will be increased to 12em." />
+  <meta name="assert" content="This test checks that a set 'column-width' may be wider (to fill the available space). In this test, the actual column-width will be increased to 12em." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 9em;
+  column-gap: 0;
+  column-width: 9em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-large-002.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: large -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: large column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' equal in width to the whole available space of the multi-column will use it all for its column box." />
+  <meta name="assert" content="This test checks that a set 'column-width' equal in width to the whole available space of the multi-column will use it all for its column box." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,18 +20,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 12em;
+  column-gap: 0;
+  column-width: 12em;
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
   bl ac
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-negative-001.xht
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: negative -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: negative column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' can not be negative." />
+  <meta name="assert" content="This test checks that a set 'column-width' can not be negative." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div
@@ -20,17 +20,17 @@
   background-color: black;
   border: black solid 1em;
   color: yellow;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 19em;
 
-  -moz-column-width: -100px;
-  -moz-column-gap: 0;
+  column-width: -100px;
+  column-gap: 0;
   }
   ]]></style>
  </head>
  <body>
   <div>4444 4444 4444 4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;&nbsp; 4444 4444 4444 4444 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 &nbsp;&nbsp;&nbsp;1 1&nbsp;&nbsp;&nbsp; 1&nbsp;&nbsp;1 4444 4444</div>
  </body>
 </html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-width-small-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-width-small-001.xht
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: narrow -moz-column-width</title>
+  <title>CSS Multi-column Layout Test: narrow column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-small-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that a set '-moz-column-width' which is small with regards to width of multi-column element." />
+  <meta name="assert" content="This test checks that a set 'column-width' which is small with regards to width of multi-column element." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   body > div
@@ -21,18 +21,18 @@
   background-color: yellow;
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
   orphans: 1;
   widows: 1;
   width: 12em;
 
-  -moz-column-gap: 0;
-  -moz-column-width: 1em;
+  column-gap: 0;
+  column-width: 1em;
   }
   div > div { overflow: hidden; }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
   <div>
--- a/layout/reftests/w3c-css/received/css-multicol/multicol-zero-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/multicol-zero-height-001.xht
@@ -1,29 +1,29 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: multi-column element with zero height</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. '-moz-column-width'" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="help" href="https://www.w3.org/TR/css-break-3/#breaking-rules" title="4. Rules for Breaking" />
   <link rel="match" href="multicol-zero-height-001-ref.xht" />
   <meta name="flags" content="" />
   <style type="text/css"><![CDATA[
   div#multi-column
   {
   height: 0;
   orphans: 1;
   widows: 1;
   width: 200px;
   border-bottom:1px solid red;
 
-  -moz-column-count: 10;
-  -moz-column-gap: 0;
+  column-count: 10;
+  column-gap: 0;
   }
 
   div > div
   {
   background-color: lime;
   float: left;
   height: 10px;
   width: 100%;
--- a/layout/reftests/w3c-css/received/css-multicol/reference/multicol-basic-005-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol/reference/multicol-basic-005-ref.xht
@@ -4,18 +4,18 @@
 <title>multicol-000</title>
 <link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
 <style type="text/css">
 div {
   margin: 1em auto;
   background: yellow;
   border: thin solid black;
   width: 600px;
-  -moz-columns: 3;
-  -moz-column-gap: 0;
-  -moz-column-rule: none;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
 }
 </style>
 </head>
 <body>
-<div>This multicol element should have a width of 600 pixels and the content should be flowed into three -moz-columns with no gap or rule between them.</div>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-writing-modes/bidi-table-001.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/bidi-table-001.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="utf-8"/>
-<title>direction: table -moz-columns</title>
+<title>direction: table columns</title>
 
 <link rel="author" title="Richard Ishida" href='mailto:ishida@w3.org'/>
 <link rel="help" href='http://www.w3.org/TR/css-writing-modes-3/#text-direction'/>
 <link rel="match" href="reference/bidi-table-001.html"/>
-<meta name="assert" content='If direction is applied to the ancestor of a table element, -moz-columns will be displayed in that direction.'/>
+<meta name="assert" content='If direction is applied to the ancestor of a table element, columns will be displayed in that direction.'/>
 <style type="text/css">
 .test { direction: rtl; }
 
  /* the following styles are not part of the test */
 .test, .ref { font-size: 150%; border: 1px solid orange; margin: 10px; width: 10em; padding: 5px; clear: both; }
 input { margin: 5px; }
 @font-face {
     font-family: 'ezra_silregular';
--- a/layout/reftests/w3c-css/received/css-writing-modes/reference/bidi-table-001.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/reference/bidi-table-001.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="utf-8"/>
-<title>direction: table -moz-columns</title>
+<title>direction: table columns</title>
 
 <link rel="author" title="Richard Ishida" href='mailto:ishida@w3.org'/>
 <style type="text/css">
 .test { direction: rtl; }
 
  /* the following styles are not part of the test */
 .test, .ref { font-size: 150%; border: 1px solid orange; margin: 10px; width: 10em; padding: 5px; clear: both; }
 input { margin: 5px; }
--- a/layout/reftests/w3c-css/received/css-writing-modes/row-progression-slr-023.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/row-progression-slr-023.xht
@@ -6,17 +6,17 @@
 
   <title>CSS Writing Modes Test: sideways-lr - table rows progression</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
-  <meta content="This test checks that rows of a table element with in a 'sideways-lr' writing mode are laid out one after the other, rightwardedly, with the first beginning at the leftmost side of the table box; table rows are ordered from left to right meaning that the 1st row is the leftmost one and then the 2nd row is juxtaposed to its right-hand side, the 3rd row is juxtaposed to the 2nd row on its right-hand side, etc... Table cells and table -moz-columns in a table with writing-mode set to 'sideways-lr' are ordered according to inline flow direction, which is from bottom to top." name="assert" />
+  <meta content="This test checks that rows of a table element with in a 'sideways-lr' writing mode are laid out one after the other, rightwardedly, with the first beginning at the leftmost side of the table box; table rows are ordered from left to right meaning that the 1st row is the leftmost one and then the 2nd row is juxtaposed to its right-hand side, the 3rd row is juxtaposed to the 2nd row on its right-hand side, etc... Table cells and table columns in a table with writing-mode set to 'sideways-lr' are ordered according to inline flow direction, which is from bottom to top." name="assert" />
 
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
--- a/layout/reftests/w3c-css/received/css-writing-modes/row-progression-slr-029.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/row-progression-slr-029.xht
@@ -6,17 +6,17 @@
 
   <title>CSS Writing Modes Test: sideways-lr - table rows progression (thead, 2 tbodies, tfoot)</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
-  <meta content="This test checks that rows of a table element with in a 'sideways-lr' writing mode are laid out one after the other, rightwardedly, with the first beginning at the leftmost side of the table box; table rows are ordered from left to right meaning that the 1st row is the leftmost one and then the 2nd row is juxtaposed to its right-hand side, the 3rd row is juxtaposed to the 2nd row on its right-hand side, etc... Table cells and table -moz-columns in a table with writing-mode set to 'sideways-lr' are ordered according to inline flow direction, which is from bottom to top." name="assert" />
+  <meta content="This test checks that rows of a table element with in a 'sideways-lr' writing mode are laid out one after the other, rightwardedly, with the first beginning at the leftmost side of the table box; table rows are ordered from left to right meaning that the 1st row is the leftmost one and then the 2nd row is juxtaposed to its right-hand side, the 3rd row is juxtaposed to the 2nd row on its right-hand side, etc... Table cells and table columns in a table with writing-mode set to 'sideways-lr' are ordered according to inline flow direction, which is from bottom to top." name="assert" />
 
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-002.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-002.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and vertical-rl</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and vertical-rl</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-21 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-003.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-003.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and vertical-lr</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and vertical-lr</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-21 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-004.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-004.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and vertical-rl</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and vertical-rl</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-21 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-005.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-005.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and vertical-lr</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and vertical-lr</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-21 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-slr-007.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-slr-007.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and sideways-lr</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and sideways-lr</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-22 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-srl-006.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-column-order-srl-006.xht
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
-  <title>CSS Writing Modes Test: 'direction: rtl' - table -moz-columns order and sideways-rl</title>
+  <title>CSS Writing Modes Test: 'direction: rtl' - table columns order and sideways-rl</title>
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-22 -->
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-slr-002.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-slr-002.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <title>CSS Test: sideways-lr Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that sideways-lr tables order -moz-columns bottom-to-top (LTR) or top-to-bottom (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table -moz-columns and column groups.">
+<meta name="assert" content="This test checks that sideways-lr tables order columns bottom-to-top (LTR) or top-to-bottom (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
     writing-mode: sideways-lr;
   }
   [dir=rtl] {
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-srl-002.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-srl-002.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Test: sideways-rl Table Column/Colgroup Ordering</title>
 <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that sideways-rl tables order -moz-columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table -moz-columns and column groups.">
+<meta name="assert" content="This test checks that sideways-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
     writing-mode: sideways-rl;
   }
   [dir=rtl] {
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vlr-002.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vlr-002.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Test: vertical-lr Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2016-01-15 -->
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that vertical-lr tables order -moz-columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table -moz-columns and column groups.">
+<meta name="assert" content="This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction"z>
 
 <style>
   .test {
     writing-mode: vertical-lr;
   }
   [dir=rtl] {
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vlr-004.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vlr-004.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Test: vertical-lr upright orientation Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that vertical-lr tables, whether LTR or RTL, order -moz-columns top-to-bottom when text-orientation is upright.">
+<meta name="assert" content="This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction"z>
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" title="5.1 Orienting Text: the 'text-orientation' property">
 
 <style>
   .test {
     writing-mode: vertical-lr;
     text-orientation: upright;
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vrl-002.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vrl-002.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Test: vertical-rl Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2016-01-15 -->
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that vertical-rl tables order -moz-columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table -moz-columns and column groups.">
+<meta name="assert" content="This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
     writing-mode: vertical-rl;
   }
   [dir=rtl] {
--- a/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vrl-004.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/table-progression-vrl-004.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>CSS Test: vertical-rl upright orientation Table Column/Colgroup Ordering</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
-<meta name="assert" content="This test checks that vertical-rl tables, whether LTR or RTL, order -moz-columns top-to-bottom when text-orientation is upright.">
+<meta name="assert" content="This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" title="5.1 Orienting Text: the 'text-orientation' property">
 
 <style>
   .test {
     writing-mode: vertical-rl;
     text-orientation: upright;
--- a/layout/reftests/w3c-css/received/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html
@@ -23,13 +23,13 @@
 }
 .ref {
   white-space: nowrap;
 }
 </style>
 </head>
 <body>
 <p>Test passes two blocks look identical.
-If the right most -moz-columns do not match, the test is invalid.</p>
+If the right most columns do not match, the test is invalid.</p>
 <div class="vrl ref">ああああああああ<br>あああああああ<br>「<span class=tcy>12</span></div>
 <div class="vrl ref">ああああああああ<br>あああああああ<br>「<span class=tcy>12</span></div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/css-writing-modes/text-combine-upright-line-breaking-rules-001.html
+++ b/layout/reftests/w3c-css/received/css-writing-modes/text-combine-upright-line-breaking-rules-001.html
@@ -26,13 +26,13 @@
 }
 .ref {
   white-space: nowrap;
 }
 </style>
 </head>
 <body>
 <p>Test passes two blocks look identical.
-If the right most -moz-columns do not match, the test is invalid.</p>
+If the right most columns do not match, the test is invalid.</p>
 <div class=vrl>あああああああああああああああ「<span class=tcy>12</span></div>
 <div class="vrl ref">ああああああああ<br>あああああああ<br>「<span class=tcy>12</span></div>
 </body>
 </html>
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -145,17 +145,17 @@ fuzzy(0-127,0-500) == css-multicol/multi
 fails-if(!OSX) random-if(OSX) == css-multicol/multicol-rule-px-001.xht css-multicol/multicol-rule-ref.xht
 fuzzy(0-127,0-500) == css-multicol/multicol-rule-ridge-000.xht css-multicol/multicol-rule-ridge-000-ref.xht
 == css-multicol/multicol-rule-samelength-001.xht css-multicol/multicol-rule-samelength-001-ref.xht
 == css-multicol/multicol-rule-shorthand-001.xht css-multicol/multicol-rule-samelength-001-ref.xht
 skip == css-multicol/multicol-rule-shorthand-2.xht css-multicol/multicol-rule-shorthand-2-ref.xht
 fuzzy(0-106,0-354) == css-multicol/multicol-rule-solid-000.xht css-multicol/multicol-rule-solid-000-ref.xht
 fails-if(!OSX) random-if(OSX) == css-multicol/multicol-rule-stacking-001.xht css-multicol/multicol-rule-stacking-ref.xht
 fails-if(!OSX||webrender) random-if(OSX) == css-multicol/multicol-shorthand-001.xht css-multicol/multicol-rule-ref.xht
-pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-000.xht css-multicol/multicol-span-000-ref.xht
+pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-000.xht css-multicol/multicol-span-000-ref.xht
 pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-001.xht css-multicol/multicol-span-all-001-ref.xht
 pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-002.xht css-multicol/multicol-span-all-002-ref.xht
 pref(layout.css.column-span.enabled,true) fails-if(!OSX) random-if(OSX) == css-multicol/multicol-span-all-003.xht css-multicol/multicol-count-002-ref.xht
 pref(layout.css.column-span.enabled,true) fuzzy-if(winWidget,40-47,8-8) fuzzy-if(OSX,0-27,0-11) == css-multicol/multicol-span-all-block-sibling-003.xht css-multicol/multicol-span-all-block-sibling-3-ref.xht
 pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-001.xht css-multicol/multicol-span-all-margin-001-ref.xht
 pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-002.xht css-multicol/multicol-span-all-margin-002-ref.xht
 pref(layout.css.column-span.enabled,true) fails == css-multicol/multicol-span-all-margin-bottom-001.xht css-multicol/multicol-span-all-margin-bottom-001-ref.xht
 pref(layout.css.column-span.enabled,true) == css-multicol/multicol-span-all-margin-nested-001.xht css-multicol/multicol-span-all-margin-nested-001-ref.xht
--- a/testing/gtest/remotegtests.py
+++ b/testing/gtest/remotegtests.py
@@ -25,16 +25,18 @@ import mozlog
 LOGGER_NAME = 'gtest'
 log = mozlog.unstructured.getLogger(LOGGER_NAME)
 
 
 class RemoteGTests(object):
     """
        A test harness to run gtest on Android.
     """
+    def __init__(self):
+        self.device = None
 
     def build_environment(self, shuffle, test_filter):
         """
            Create and return a dictionary of all the appropriate env variables
            and values.
         """
         env = {}
         env["XPCOM_DEBUG_BREAK"] = "stack-and-abort"
@@ -185,20 +187,21 @@ class RemoteGTests(object):
         finally:
             try:
                 shutil.rmtree(dump_dir)
             except Exception:
                 log.warning("unable to remove directory: %s" % dump_dir)
         return crashed
 
     def cleanup(self):
-        self.device.stop_application(self.package)
-        self.device.rm(self.remote_log, force=True, root=True)
-        self.device.rm(self.remote_profile, recursive=True, force=True, root=True)
-        self.device.rm(self.remote_minidumps, recursive=True, force=True, root=True)
+        if self.device:
+            self.device.stop_application(self.package)
+            self.device.rm(self.remote_log, force=True, root=True)
+            self.device.rm(self.remote_profile, recursive=True, force=True, root=True)
+            self.device.rm(self.remote_minidumps, recursive=True, force=True, root=True)
 
 
 class AppWaiter(object):
     def __init__(self, device, remote_log,
                  test_proc_timeout=1200, test_proc_no_output_timeout=300,
                  test_proc_start_timeout=60, output_poll_interval=10):
         self.device = device
         self.remote_log = remote_log
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -5245,31 +5245,32 @@ static gfx::IntPoint GetIntegerDeltaForE
   }
 
   nsCOMPtr<nsIDragSession> dragSession;
   mDragService->GetCurrentSession(getter_AddRefs(dragSession));
   if (dragSession) {
     if (aMessage == eDragOver) {
       // fire the drag event at the source. Just ignore whether it was
       // cancelled or not as there isn't actually a means to stop the drag
-      mDragService->FireDragEventAtSource(eDrag,
-                                          nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
+      nsCOMPtr<nsIDragService> dragService = mDragService;
+      dragService->FireDragEventAtSource(eDrag,
+                                         nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
       dragSession->SetCanDrop(false);
     } else if (aMessage == eDrop) {
       // We make the assumption that the dragOver handlers have correctly set
       // the |canDrop| property of the Drag Session.
       bool canDrop = false;
       if (!NS_SUCCEEDED(dragSession->GetCanDrop(&canDrop)) || !canDrop) {
         [self doDragAction:eDragExit sender:aSender];
 
         nsCOMPtr<nsINode> sourceNode;
         dragSession->GetSourceNode(getter_AddRefs(sourceNode));
         if (!sourceNode) {
-          mDragService->EndDragSession(false,
-                                       nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
+          nsCOMPtr<nsIDragService> dragService = mDragService;
+          dragService->EndDragSession(false, nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
         }
         return NSDragOperationNone;
       }
     }
 
     unsigned int modifierFlags = [[NSApp currentEvent] modifierFlags];
     uint32_t action = nsIDragService::DRAGDROP_ACTION_MOVE;
     // force copy = option, alias = cmd-option, default is move
@@ -5319,18 +5320,18 @@ static gfx::IntPoint GetIntegerDeltaForE
       case eDrop: {
         nsCOMPtr<nsINode> sourceNode;
         dragSession->GetSourceNode(getter_AddRefs(sourceNode));
         if (!sourceNode) {
           // We're leaving a window while doing a drag that was
           // initiated in a different app. End the drag session,
           // since we're done with it for now (until the user
           // drags back into mozilla).
-          mDragService->EndDragSession(false,
-                                       nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
+          nsCOMPtr<nsIDragService> dragService = mDragService;
+          dragService->EndDragSession(false, nsCocoaUtils::ModifiersForEvent([NSApp currentEvent]));
         }
       }
       default:
         break;
     }
   }
 
   return NSDragOperationGeneric;
@@ -5406,17 +5407,17 @@ static gfx::IntPoint GetIntegerDeltaForE
 
   if (!mDragService) {
     CallGetService(kDragServiceContractID, &mDragService);
     NS_ASSERTION(mDragService, "Couldn't get a drag service - big problem!");
   }
 
   if (mDragService) {
     // set the dragend point from the current mouse location
-    nsDragService* dragService = static_cast<nsDragService*>(mDragService);
+    RefPtr<nsDragService> dragService = static_cast<nsDragService*>(mDragService);
     FlipCocoaScreenCoordinate(aPoint);
     dragService->SetDragEndPoint(gfx::IntPoint::Round(aPoint.x, aPoint.y));
 
     NSPoint pnt = [NSEvent mouseLocation];
     FlipCocoaScreenCoordinate(pnt);
     dragService->SetDragEndPoint(gfx::IntPoint::Round(pnt.x, pnt.y));
 
     // XXX: dropEffect should be updated per |aOperation|.
@@ -5429,17 +5430,17 @@ static gfx::IntPoint GetIntegerDeltaForE
     // All that said, NSDragOperationNone is still reliable.
     if (aOperation == NSDragOperationNone) {
       RefPtr<dom::DataTransfer> dataTransfer = dragService->GetDataTransfer();
       if (dataTransfer) {
         dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
       }
     }
 
-    mDragService->EndDragSession(true, nsCocoaUtils::ModifiersForEvent(currentEvent));
+    dragService->EndDragSession(true, nsCocoaUtils::ModifiersForEvent(currentEvent));
     NS_RELEASE(mDragService);
   }
 
   [globalDragPboard release];
   globalDragPboard = nil;
   [gLastDragMouseDownEvent release];
   gLastDragMouseDownEvent = nil;
 
--- a/widget/cocoa/nsDragService.h
+++ b/widget/cocoa/nsDragService.h
@@ -18,21 +18,21 @@ extern NSString* const kMozWildcardPboar
 extern NSString* const kMozCustomTypesPboardType;
 extern NSString* const kMozFileUrlsPboardType;
 
 class nsDragService : public nsBaseDragService {
  public:
   nsDragService();
 
   // nsBaseDragService
-  virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                         const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
-                                         uint32_t aActionType) override;
+  MOZ_CAN_RUN_SCRIPT virtual nsresult InvokeDragSessionImpl(
+      nsIArray* anArrayTransferables, const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
+      uint32_t aActionType) override;
   // nsIDragService
-  NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override;
+  MOZ_CAN_RUN_SCRIPT NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override;
   NS_IMETHOD UpdateDragImage(nsINode* aImage, int32_t aImageX, int32_t aImageY) override;
 
   // nsIDragSession
   NS_IMETHOD GetData(nsITransferable* aTransferable, uint32_t aItemIndex) override;
   NS_IMETHOD IsDataFlavorSupported(const char* aDataFlavor, bool* _retval) override;
   NS_IMETHOD GetNumDropItems(uint32_t* aNumItems) override;
 
   void DragMovedWithView(NSDraggingSession* aSession, NSPoint aPoint);
--- a/widget/gtk/nsDragService.h
+++ b/widget/gtk/nsDragService.h
@@ -53,27 +53,28 @@ class nsDragService final : public nsBas
  public:
   nsDragService();
 
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_DECL_NSIOBSERVER
 
   // nsBaseDragService
-  virtual nsresult InvokeDragSessionImpl(
+  MOZ_CAN_RUN_SCRIPT virtual nsresult InvokeDragSessionImpl(
       nsIArray* anArrayTransferables,
       const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
       uint32_t aActionType) override;
   // nsIDragService
-  NS_IMETHOD InvokeDragSession(nsINode* aDOMNode, nsIPrincipal* aPrincipal,
-                               nsIArray* anArrayTransferables,
-                               uint32_t aActionType,
-                               nsContentPolicyType aContentPolicyType) override;
+  MOZ_CAN_RUN_SCRIPT NS_IMETHOD
+  InvokeDragSession(nsINode* aDOMNode, nsIPrincipal* aPrincipal,
+                    nsIArray* anArrayTransferables, uint32_t aActionType,
+                    nsContentPolicyType aContentPolicyType) override;
   NS_IMETHOD StartDragSession() override;
-  NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override;
+  MOZ_CAN_RUN_SCRIPT NS_IMETHOD EndDragSession(bool aDoneDrag,
+                                               uint32_t aKeyModifiers) override;
 
   // nsIDragSession
   NS_IMETHOD SetCanDrop(bool aCanDrop) override;
   NS_IMETHOD GetCanDrop(bool* aCanDrop) override;
   NS_IMETHOD GetNumDropItems(uint32_t* aNumItems) override;
   NS_IMETHOD GetData(nsITransferable* aTransferable,
                      uint32_t aItemIndex) override;
   NS_IMETHOD IsDataFlavorSupported(const char* aDataFlavor,
@@ -206,20 +207,20 @@ class nsDragService final : public nsBas
                       const mozilla::LayoutDeviceIntRect& dragRect);
 
   gboolean Schedule(DragTask aTask, nsWindow* aWindow,
                     GdkDragContext* aDragContext,
                     nsWaylandDragContext* aPendingWaylandDragContext,
                     mozilla::LayoutDeviceIntPoint aWindowPoint, guint aTime);
 
   // Callback for g_idle_add_full() to run mScheduledTask.
-  static gboolean TaskDispatchCallback(gpointer data);
-  gboolean RunScheduledTask();
+  MOZ_CAN_RUN_SCRIPT static gboolean TaskDispatchCallback(gpointer data);
+  MOZ_CAN_RUN_SCRIPT gboolean RunScheduledTask();
   void UpdateDragAction();
-  void DispatchMotionEvents();
+  MOZ_CAN_RUN_SCRIPT void DispatchMotionEvents();
   void ReplyToDragMotion(GdkDragContext* aDragContext);
 #ifdef MOZ_WAYLAND
   void ReplyToDragMotion(nsWaylandDragContext* aDragContext);
 #endif
   gboolean DispatchDropEvent();
   static uint32_t GetCurrentModifiers();
 };
 
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -112,16 +112,17 @@ using namespace mozilla::widget;
 #include "gfxUtils.h"
 #include "Layers.h"
 #include "GLContextProvider.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/HelpersCairo.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
+#include "mozilla/layers/KnowsCompositor.h"
 
 #ifdef MOZ_X11
 #  include "GLContextGLX.h"  // for GLContextGLX::FindVisual()
 #  include "GtkCompositorWidget.h"
 #  include "gfxXlibSurface.h"
 #  include "WindowSurfaceX11Image.h"
 #  include "WindowSurfaceX11SHM.h"
 #  include "WindowSurfaceXRender.h"
@@ -4231,23 +4232,28 @@ void nsWindow::SetHasMappedToplevel(bool
   }
 }
 
 LayoutDeviceIntSize nsWindow::GetSafeWindowSize(LayoutDeviceIntSize aSize) {
   // The X protocol uses CARD32 for window sizes, but the server (1.11.3)
   // reads it as CARD16.  Sizes of pixmaps, used for drawing, are (unsigned)
   // CARD16 in the protocol, but the server's ProcCreatePixmap returns
   // BadAlloc if dimensions cannot be represented by signed shorts.
+  // Because we are creating Cairo surfaces to represent window buffers,
+  // we also must ensure that the window can fit in a Cairo surface.
   LayoutDeviceIntSize result = aSize;
-  const int32_t kInt16Max = 32767;
-  if (result.width > kInt16Max) {
-    result.width = kInt16Max;
-  }
-  if (result.height > kInt16Max) {
-    result.height = kInt16Max;
+  int32_t maxSize = 32767;
+  if (mLayerManager && mLayerManager->AsKnowsCompositor()) {
+    maxSize = std::min(maxSize, mLayerManager->AsKnowsCompositor()->GetMaxTextureSize());
+  }
+  if (result.width > maxSize) {
+    result.width = maxSize;
+  }
+  if (result.height > maxSize) {
+    result.height = maxSize;
   }
   return result;
 }
 
 void nsWindow::EnsureGrabs(void) {
   if (mRetryPointerGrab) GrabPointer(sRetryGrabTime);
 }
 
--- a/widget/nsBaseDragService.h
+++ b/widget/nsBaseDragService.h
@@ -72,17 +72,17 @@ class nsBaseDragService : public nsIDrag
  protected:
   virtual ~nsBaseDragService();
 
   /**
    * Called from nsBaseDragService to initiate a platform drag from a source
    * in this process.  This is expected to ensure that StartDragSession() and
    * EndDragSession() get called if the platform drag is successfully invoked.
    */
-  virtual nsresult InvokeDragSessionImpl(
+  MOZ_CAN_RUN_SCRIPT virtual nsresult InvokeDragSessionImpl(
       nsIArray* aTransferableArray,
       const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
       uint32_t aActionType) = 0;
 
   /**
    * Draw the drag image, if any, to a surface and return it. The drag image
    * is constructed from mImage if specified, or aDOMNode if mImage is null.
    *
--- a/widget/nsIDragService.idl
+++ b/widget/nsIDragService.idl
@@ -45,16 +45,17 @@ interface nsIDragService : nsISupports
     * @param  aPrincipal - the triggering principal of the drag, or null if
     *                      it's from browser chrome or OS
     * @param  aTransferables - an array of transferables to be dragged
     * @param  aActionType - specified which of copy/move/link are allowed
     * @param  aContentPolicyType - the contentPolicyType that will be
     *           passed to the loadInfo when creating a new channel
     *           (defaults to TYPE_OTHER)
     */
+  [can_run_script]
   void invokeDragSession (in Node aDOMNode,
                           in nsIPrincipal aPrincipal,
                           in nsIArray aTransferables,
                           in unsigned long aActionType,
                           [optional] in nsContentPolicyType aContentPolicyType);
 
   /**
    * Starts a modal drag session using an image. The first four arguments are
@@ -78,17 +79,17 @@ interface nsIDragService : nsISupports
    * a document, it will be rendered at its displayed size, othewise, it will be
    * rendered at its real size. For other types of elements, the element is
    * rendered into an offscreen buffer in the same manner as it is currently
    * displayed. The document selection is hidden while drawing.
    *
    * The aDragEvent must be supplied as the current screen coordinates of the
    * event are needed to calculate the image location.
    */
-  [noscript]
+  [noscript, can_run_script]
   void invokeDragSessionWithImage(in Node aDOMNode,
                                   in nsIPrincipal aPrincipal,
                                   in nsIArray aTransferableArray,
                                   in unsigned long aActionType,
                                   in Node aImage,
                                   in long aImageX,
                                   in long aImageY,
                                   in DragEvent aDragEvent,
@@ -96,16 +97,17 @@ interface nsIDragService : nsISupports
 
   /**
    * Start a modal drag session using the selection as the drag image.
    * The aDragEvent must be supplied as the current screen coordinates of the
    * event are needed to calculate the image location.
    *
    * Note: This method is deprecated for non-native code.
    */
+  [can_run_script]
   void invokeDragSessionWithSelection(in Selection aSelection,
                                       in nsIPrincipal aPrincipal,
                                       in nsIArray aTransferableArray,
                                       in unsigned long aActionType,
                                       in DragEvent aDragEvent,
                                       in DataTransferPtr aDataTransfer);
 
   /**
@@ -121,29 +123,32 @@ interface nsIDragService : nsISupports
 
   /**
     * Tells the Drag Service to end a drag session. This is called when
     * an external drag occurs
     *
     * If aDoneDrag is true, the drag has finished, otherwise the drag has
     * just left the window.
     */
+  [can_run_script]
   void endDragSession(in boolean aDoneDrag,
                       [optional] in unsigned long aKeyModifiers);
 
   /**
    * Fire a drag event at the source of the drag
    */
-  [noscript] void fireDragEventAtSource(in EventMessage aEventMessage,
-                                        in unsigned long aKeyModifiers);
+  [noscript, can_run_script]
+  void fireDragEventAtSource(in EventMessage aEventMessage,
+                             in unsigned long aKeyModifiers);
 
   /**
    * Increase/decrease dragging suppress level by one.
    * If level is greater than one, dragging is disabled.
    */
+  [can_run_script]
   void suppress();
   void unsuppress();
 
   /**
     * aX and aY are in LayoutDevice pixels.
     */
   [noscript] void dragMoved(in long aX, in long aY);
 
--- a/widget/windows/nsDragService.cpp
+++ b/widget/windows/nsDragService.cpp
@@ -246,19 +246,18 @@ static bool LayoutDevicePointToCSSPoint(
   CSSIntPoint screenOriginCSS;
   screen->GetRectDisplayPix(&screenOriginCSS.x, &screenOriginCSS.y, &w, &h);
 
   aCSSPos = (aDevPos - screenOriginDev) * devToCSSScale + screenOriginCSS;
   return true;
 }
 
 //-------------------------------------------------------------------------
-NS_IMETHODIMP
-nsDragService::StartInvokingDragSession(IDataObject* aDataObj,
-                                        uint32_t aActionType) {
+nsresult nsDragService::StartInvokingDragSession(IDataObject* aDataObj,
+                                                 uint32_t aActionType) {
   // To do the drag we need to create an object that
   // implements the IDataObject interface (for OLE)
   RefPtr<nsNativeDragSource> nativeDragSrc =
       new nsNativeDragSource(mDataTransfer);
 
   // Now figure out what the native drag effect should be
   DWORD winDropRes;
   DWORD effects = DROPEFFECT_SCROLL;
--- a/widget/windows/nsDragService.h
+++ b/widget/windows/nsDragService.h
@@ -18,34 +18,35 @@ class nsDataObjCollection;
  */
 
 class nsDragService : public nsBaseDragService {
  public:
   nsDragService();
   virtual ~nsDragService();
 
   // nsBaseDragService
-  virtual nsresult InvokeDragSessionImpl(
+  MOZ_CAN_RUN_SCRIPT virtual nsresult InvokeDragSessionImpl(
       nsIArray* anArrayTransferables,
       const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
       uint32_t aActionType);
 
   // nsIDragSession
   NS_IMETHOD GetData(nsITransferable* aTransferable, uint32_t anItem) override;
   NS_IMETHOD GetNumDropItems(uint32_t* aNumItems) override;
   NS_IMETHOD IsDataFlavorSupported(const char* aDataFlavor,
                                    bool* _retval) override;
-  NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override;
+  MOZ_CAN_RUN_SCRIPT NS_IMETHOD EndDragSession(bool aDoneDrag,
+                                               uint32_t aKeyModifiers) override;
   NS_IMETHOD UpdateDragImage(nsINode* aImage, int32_t aImageX,
                              int32_t aImageY) override;
 
   // native impl.
   NS_IMETHOD SetIDataObject(IDataObject* aDataObj);
-  NS_IMETHOD StartInvokingDragSession(IDataObject* aDataObj,
-                                      uint32_t aActionType);
+  MOZ_CAN_RUN_SCRIPT nsresult StartInvokingDragSession(IDataObject* aDataObj,
+                                                       uint32_t aActionType);
 
   // A drop occurred within the application vs. outside of it.
   void SetDroppedLocal();
 
   IDataObject* GetDataObject() { return mDataObject; }
 
  protected:
   nsDataObjCollection* GetDataObjCollection(IDataObject* aDataObj);
--- a/widget/windows/nsNativeDragTarget.cpp
+++ b/widget/windows/nsNativeDragTarget.cpp
@@ -322,17 +322,18 @@ nsNativeDragTarget::DragOver(DWORD grfKe
       GetDropTargetHelper()->DragEnter(mHWnd, dragService->GetDataObject(), &pt,
                                        *pdwEffect);
     }
     POINT pt = {ptl.x, ptl.y};
     GetDropTargetHelper()->DragOver(&pt, *pdwEffect);
   }
 
   ModifierKeyState modifierKeyState;
-  mDragService->FireDragEventAtSource(eDrag, modifierKeyState.GetModifiers());
+  nsCOMPtr<nsIDragService> dragService = mDragService;
+  dragService->FireDragEventAtSource(eDrag, modifierKeyState.GetModifiers());
   // Now process the native drag state and then dispatch the event
   ProcessDrag(eDragOver, grfKeyState, ptl, pdwEffect);
 
   this->Release();
 
   return S_OK;
 }
 
@@ -358,17 +359,18 @@ nsNativeDragTarget::DragLeave() {
     currentDragSession->GetSourceNode(getter_AddRefs(sourceNode));
 
     if (!sourceNode) {
       // We're leaving a window while doing a drag that was
       // initiated in a different app. End the drag session, since
       // we're done with it for now (until the user drags back into
       // mozilla).
       ModifierKeyState modifierKeyState;
-      mDragService->EndDragSession(false, modifierKeyState.GetModifiers());
+      nsCOMPtr<nsIDragService> dragService = mDragService;
+      dragService->EndDragSession(false, modifierKeyState.GetModifiers());
     }
   }
 
   // release the ref that was taken in DragEnter
   NS_ASSERTION(mTookOwnRef, "want to release own ref, but not taken!");
   if (mTookOwnRef) {
     this->Release();
     mTookOwnRef = false;
@@ -380,17 +382,18 @@ nsNativeDragTarget::DragLeave() {
 void nsNativeDragTarget::DragCancel() {
   // Cancel the drag session if we did DragEnter.
   if (mTookOwnRef) {
     if (GetDropTargetHelper()) {
       GetDropTargetHelper()->DragLeave();
     }
     if (mDragService) {
       ModifierKeyState modifierKeyState;
-      mDragService->EndDragSession(false, modifierKeyState.GetModifiers());
+      nsCOMPtr<nsIDragService> dragService = mDragService;
+      dragService->EndDragSession(false, modifierKeyState.GetModifiers());
     }
     this->Release();  // matching the AddRef in DragEnter
     mTookOwnRef = false;
   }
 }
 
 STDMETHODIMP
 nsNativeDragTarget::Drop(LPDATAOBJECT pData, DWORD grfKeyState, POINTL aPT,
--- a/widget/windows/nsNativeDragTarget.h
+++ b/widget/windows/nsNativeDragTarget.h
@@ -43,34 +43,37 @@ class nsNativeDragTarget final : public 
   // in grfKeyState, and the coordinates specified by point. This is
   // called by OLE when a drag enters this object's window (as registered
   // by Initialize).
   STDMETHODIMP DragEnter(LPDATAOBJECT pSource, DWORD grfKeyState, POINTL point,
                          DWORD* pEffect);
 
   // Similar to DragEnter except it is called frequently while the drag
   // is over this object's window.
-  STDMETHODIMP DragOver(DWORD grfKeyState, POINTL point, DWORD* pEffect);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY STDMETHODIMP DragOver(DWORD grfKeyState,
+                                                    POINTL point,
+                                                    DWORD* pEffect);
 
   // Release the drag-drop source and put internal state back to the point
   // before the call to DragEnter. This is called when the drag leaves
   // without a drop occurring.
-  STDMETHODIMP DragLeave();
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY STDMETHODIMP DragLeave();
 
   // If point is within our region of interest and pSource's data supports
   // one of our formats, get the data and set pEffect according to
   // grfKeyState (DROPEFFECT_MOVE if the control key was not pressed,
   // DROPEFFECT_COPY if the control key was pressed). Otherwise return
   // E_FAIL.
-  STDMETHODIMP Drop(LPDATAOBJECT pSource, DWORD grfKeyState, POINTL point,
-                    DWORD* pEffect);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY STDMETHODIMP Drop(LPDATAOBJECT pSource,
+                                                DWORD grfKeyState, POINTL point,
+                                                DWORD* pEffect);
   /**
    * Cancel the current drag session, if any.
    */
-  void DragCancel();
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void DragCancel();
 
   static void DragImageChanged() { gDragImageChanged = true; }
 
  protected:
   void GetGeckoDragAction(DWORD grfKeyState, LPDWORD pdwEffect,
                           uint32_t* aGeckoAction);
   void ProcessDrag(mozilla::EventMessage aEventMessage, DWORD grfKeyState,
                    POINTL pt, DWORD* pdwEffect);