Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge last green changeset from mozilla-inbound to mozilla-central

Browse Source
This commit is contained in:
Marco Bonardo 2011-08-03 10:46:22 +02:00
commit b245bb61dd
102 changed files with 2276 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/public/nsIMozWebSocket.idl
View File

@ -51,7 +51,7 @@ interface nsPIDOMWindow;
* http://dev.w3.org/html5/websockets/
*
*/
[scriptable, uuid(eae76132-e4a4-4765-8494-5e136521c846)]
[scriptable, uuid(662691db-2b99-4461-801b-fbb72d99a4b9)]
interface nsIMozWebSocket : nsISupports
{
readonly attribute DOMString url;
@ -79,7 +79,7 @@ interface nsIMozWebSocket : nsISupports
* @return if the connection is still established (and the data was queued or
* sent successfully).
*/
boolean send(in DOMString data);
void send(in DOMString data);
/**
* Closes the Web Socket connection or connection attempt, if any.

7
content/base/public/nsTreeSanitizer.h
View File

@ -137,10 +137,11 @@ class NS_STACK_CLASS nsTreeSanitizer {
* @param aElement the element whose attribute to possibly modify
* @param aNamespace the namespace of the URL attribute
* @param aLocalName the local name of the URL attribute
* @return true if the attribute was removed and false otherwise
*/
void SanitizeURL(mozilla::dom::Element* aElement,
PRInt32 aNamespace,
nsIAtom* aLocalName);
PRBool SanitizeURL(mozilla::dom::Element* aElement,
PRInt32 aNamespace,
nsIAtom* aLocalName);
/**
* Checks a style rule for the presence of the 'binding' CSS property and

2
content/base/src/nsDocument.cpp
View File

@ -1580,6 +1580,8 @@ nsDocument::~nsDocument()
nsCycleCollector_DEBUG_wasFreed(static_cast<nsIDocument*>(this));
#endif
NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document");
mInDestructor = PR_TRUE;
mInUnlinkOrDeletion = PR_TRUE;

25
content/base/src/nsTreeSanitizer.cpp
View File

@ -1227,7 +1227,12 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
continue;
}
if (IsURL(aURLs, attrLocal)) {
SanitizeURL(aElement, attrNs, attrLocal);
if (SanitizeURL(aElement, attrNs, attrLocal)) {
// in case the attribute removal shuffled the attribute order, start
// the loop again.
--ac;
i = ac; // i will be decremented immediately thanks to the for loop
}
continue;
}
if (aAllowed->GetEntry(attrLocal) &&
@ -1252,7 +1257,12 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
// else not allowed
} else if (kNameSpaceID_XML == attrNs) {
if (nsGkAtoms::base == attrLocal) {
SanitizeURL(aElement, attrNs, attrLocal);
if (SanitizeURL(aElement, attrNs, attrLocal)) {
// in case the attribute removal shuffled the attribute order, start
// the loop again.
--ac;
i = ac; // i will be decremented immediately thanks to the for loop
}
continue;
}
if (nsGkAtoms::lang == attrLocal || nsGkAtoms::space == attrLocal) {
@ -1261,7 +1271,12 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
// else not allowed
} else if (aAllowXLink && kNameSpaceID_XLink == attrNs) {
if (nsGkAtoms::href == attrLocal) {
SanitizeURL(aElement, attrNs, attrLocal);
if (SanitizeURL(aElement, attrNs, attrLocal)) {
// in case the attribute removal shuffled the attribute order, start
// the loop again.
--ac;
i = ac; // i will be decremented immediately thanks to the for loop
}
continue;
}
if (nsGkAtoms::type == attrLocal || nsGkAtoms::title == attrLocal
@ -1288,7 +1303,7 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
}
}
void
PRBool
nsTreeSanitizer::SanitizeURL(mozilla::dom::Element* aElement,
PRInt32 aNamespace,
nsIAtom* aLocalName)
@ -1312,7 +1327,9 @@ nsTreeSanitizer::SanitizeURL(mozilla::dom::Element* aElement,
}
if (NS_FAILED(rv)) {
aElement->UnsetAttr(aNamespace, aLocalName, PR_FALSE);
return PR_TRUE;
}
return PR_FALSE;
}
void

16
content/base/src/nsWebSocket.cpp
View File

@ -375,7 +375,6 @@ nsWebSocketEstablishedConnection::Close()
nsRefPtr<nsWebSocketEstablishedConnection> kungfuDeathGrip = this;
if (mOwner->mReadyState == nsIMozWebSocket::CONNECTING) {
mOwner->SetReadyState(nsIMozWebSocket::CLOSING);
mOwner->SetReadyState(nsIMozWebSocket::CLOSED);
Disconnect();
return NS_OK;
@ -417,7 +416,7 @@ nsWebSocketEstablishedConnection::ConsoleError()
formatStrings, NS_ARRAY_LENGTH(formatStrings));
}
}
/// todo some sepcific errors - like for message too large
/// todo some specific errors - like for message too large
return rv;
}
@ -765,9 +764,12 @@ nsWebSocket::EstablishConnection()
new nsWebSocketEstablishedConnection();
rv = conn->Init(this);
NS_ENSURE_SUCCESS(rv, rv);
mConnection = conn;
if (NS_FAILED(rv)) {
Close();
mConnection = nsnull;
return rv;
}
return NS_OK;
}
@ -1236,10 +1238,9 @@ NS_WEBSOCKET_IMPL_DOMEVENTLISTENER(message, mOnMessageListener)
NS_WEBSOCKET_IMPL_DOMEVENTLISTENER(close, mOnCloseListener)
NS_IMETHODIMP
nsWebSocket::Send(const nsAString& aData, PRBool *aRet)
nsWebSocket::Send(const nsAString& aData)
{
NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread");
*aRet = PR_FALSE;
if (mReadyState == nsIMozWebSocket::CONNECTING) {
return NS_ERROR_DOM_INVALID_STATE_ERR;
@ -1266,8 +1267,7 @@ nsWebSocket::Send(const nsAString& aData, PRBool *aRet)
return NS_OK;
}
nsresult rv = mConnection->PostMessage(PromiseFlatString(aData));
*aRet = NS_SUCCEEDED(rv);
mConnection->PostMessage(PromiseFlatString(aData));
return NS_OK;
}

6
content/media/ogg/nsOggCodecState.cpp
View File

@ -678,6 +678,12 @@ nsresult nsVorbisState::ReconstructVorbisGranulepos()
if (packet->granulepos == -1) {
packet->granulepos = mGranulepos + samples;
}
// Account for a partial last frame
if (packet->e_o_s && packet->granulepos >= mGranulepos) {
samples = packet->granulepos - mGranulepos;
}
mGranulepos = packet->granulepos;
RecordVorbisPacketSamples(packet, samples);
return NS_OK;

4
content/smil/nsSMILAnimationController.cpp
View File

@ -94,8 +94,8 @@ nsSMILAnimationController::Disconnect()
NS_ABORT_IF_FALSE(mDocument, "disconnecting when we weren't connected...?");
NS_ABORT_IF_FALSE(mRefCnt.get() == 1,
"Expecting to disconnect when doc is sole remaining owner");
NS_ABORT_IF_FALSE(mPauseState & nsSMILTimeContainer::PAUSE_PAGEHIDE,
"Expecting to be paused for pagehide before disconnect");
NS_ASSERTION(mPauseState & nsSMILTimeContainer::PAUSE_PAGEHIDE,
"Expecting to be paused for pagehide before disconnect");
StopSampling(GetRefreshDriver());

1
dom/base/nsDOMClassInfo.cpp
View File

@ -94,6 +94,7 @@
#include "nsDOMWindowUtils.h"
#include "nsIDOMGlobalPropertyInitializer.h"
#include "mozilla/Preferences.h"
#include "nsLocation.h"
// Window scriptable helper includes
#include "nsIDocShell.h"

1
dom/base/nsGlobalWindow.cpp
View File

@ -242,6 +242,7 @@
#include "mozAutoDocUpdate.h"
#include "mozilla/Telemetry.h"
#include "nsLocation.h"
#ifdef PR_LOGGING
static PRLogModuleInfo* gDOMLeakPRLog;

42
dom/base/nsGlobalWindow.h
View File

@ -66,7 +66,6 @@
#include "nsIDOMNavigator.h"
#include "nsIDOMNavigatorGeolocation.h"
#include "nsIDOMNavigatorDesktopNotification.h"
#include "nsIDOMLocation.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIDOMJSWindow.h"
@ -1090,47 +1089,6 @@ nsresult NS_GetNavigatorPlatform(nsAString& aPlatform);
nsresult NS_GetNavigatorAppVersion(nsAString& aAppVersion);
nsresult NS_GetNavigatorAppName(nsAString& aAppName);
class nsIURI;
//*****************************************************************************
// nsLocation: Script "location" object
//*****************************************************************************
class nsLocation : public nsIDOMLocation
{
public:
nsLocation(nsIDocShell *aDocShell);
virtual ~nsLocation();
NS_DECL_ISUPPORTS
void SetDocShell(nsIDocShell *aDocShell);
nsIDocShell *GetDocShell();
// nsIDOMLocation
NS_DECL_NSIDOMLOCATION
protected:
// In the case of jar: uris, we sometimes want the place the jar was
// fetched from as the URI instead of the jar: uri itself. Pass in
// PR_TRUE for aGetInnermostURI when that's the case.
nsresult GetURI(nsIURI** aURL, PRBool aGetInnermostURI = PR_FALSE);
nsresult GetWritableURI(nsIURI** aURL);
nsresult SetURI(nsIURI* aURL, PRBool aReplace = PR_FALSE);
nsresult SetHrefWithBase(const nsAString& aHref, nsIURI* aBase,
PRBool aReplace);
nsresult SetHrefWithContext(JSContext* cx, const nsAString& aHref,
PRBool aReplace);
nsresult GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetSourceDocument(JSContext* cx, nsIDocument** aDocument);
nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);
nsString mCachedHash;
nsWeakPtr mDocShell;
};
/* factory function */
nsresult
NS_NewScriptGlobalObject(PRBool aIsChrome, PRBool aIsModalContentWindow,

4
dom/base/nsLocation.cpp
View File

@ -38,7 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsGlobalWindow.h"
#include "nsLocation.h"
#include "nsIScriptSecurityManager.h"
#include "nsIScriptContext.h"
#include "nsIDocShell.h"
@ -56,7 +56,6 @@
#include "prmem.h"
#include "nsCOMPtr.h"
#include "nsEscape.h"
#include "nsJSUtils.h"
#include "nsIDOMWindow.h"
#include "nsIDOMDocument.h"
#include "nsIDocument.h"
@ -72,6 +71,7 @@
#include "nsITextToSubURI.h"
#include "nsContentUtils.h"
#include "nsJSUtils.h"
#include "jsdbgapi.h"
static nsresult
GetContextFromStack(nsIJSContextStack *aStack, JSContext **aContext)

97
dom/base/nsLocation.h Normal file
View File

@ -0,0 +1,97 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 sw=2 et tw=80: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Travis Bogard <travis@netscape.com>
* Dan Rosen <dr@netscape.com>
* Vidur Apparao <vidur@netscape.com>
* Johnny Stenback <jst@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsLocation_h__
#define nsLocation_h__
#include "nsIDOMLocation.h"
#include "nsString.h"
#include "nsWeakReference.h"
class nsIURI;
class nsIDocShell;
struct JSContext;
class nsIDocument;
class nsIDocShellLoadInfo;
//*****************************************************************************
// nsLocation: Script "location" object
//*****************************************************************************
class nsLocation : public nsIDOMLocation
{
public:
nsLocation(nsIDocShell *aDocShell);
virtual ~nsLocation();
NS_DECL_ISUPPORTS
void SetDocShell(nsIDocShell *aDocShell);
nsIDocShell *GetDocShell();
// nsIDOMLocation
NS_DECL_NSIDOMLOCATION
protected:
// In the case of jar: uris, we sometimes want the place the jar was
// fetched from as the URI instead of the jar: uri itself. Pass in
// PR_TRUE for aGetInnermostURI when that's the case.
nsresult GetURI(nsIURI** aURL, PRBool aGetInnermostURI = PR_FALSE);
nsresult GetWritableURI(nsIURI** aURL);
nsresult SetURI(nsIURI* aURL, PRBool aReplace = PR_FALSE);
nsresult SetHrefWithBase(const nsAString& aHref, nsIURI* aBase,
PRBool aReplace);
nsresult SetHrefWithContext(JSContext* cx, const nsAString& aHref,
PRBool aReplace);
nsresult GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetSourceDocument(JSContext* cx, nsIDocument** aDocument);
nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);
nsString mCachedHash;
nsWeakPtr mDocShell;
};
#endif // nsLocation_h__

11
dom/interfaces/css/nsIDOMCSS2Properties.idl
View File

@ -51,7 +51,7 @@
* http://www.w3.org/TR/DOM-Level-2-Style
*/
[scriptable, uuid(7cf11a5f-4be5-4e31-b427-58d82746b5f5)]
[scriptable, uuid(10f43750-b379-11e0-aff2-0800200c9a66)]
interface nsIDOMCSS2Properties : nsISupports
{
attribute DOMString background;
@ -681,6 +681,15 @@ interface nsIDOMCSS2Properties : nsISupports
attribute DOMString MozTransformOrigin;
// raises(DOMException) on setting
attribute DOMString MozPerspective;
// raises(DOMException) on setting
attribute DOMString MozPerspectiveOrigin;
// raises(DOMException) on setting
attribute DOMString MozBackfaceVisibility;
// raises(DOMException) on setting
attribute DOMString MozWindowShadow;
// raises(DOMException) on setting

85
dom/tests/mochitest/bugs/test_resize_move_windows.html
View File

@ -82,8 +82,8 @@ function hitEventLoop(condition, test, times, next) {
function checkChangeIsDisabled(aWindow, aNext)
{
// We want to check that nothing has changed. Having a high value would take
// too much time.
var hits = 10;
// too much time. Worse thing that could happen is random green.
var hits = 5;
var originalWidth = aWindow.innerWidth;
var originalHeight = aWindow.innerHeight;
@ -94,74 +94,63 @@ function checkChangeIsDisabled(aWindow, aNext)
var oWidth = aWindow.outerWidth;
var oHeight = aWindow.outerHeight;
function sizeChangeCondition() {
return aWindow.innerWidth != originalWidth || aWindow.innerHeight != originalHeight;
function changeCondition() {
return aWindow.innerWidth != originalWidth ||
aWindow.innerHeight != originalHeight ||
aWindow.screenX != originalX || aWindow.screenY != originalY ||
aWindow.outerWidth != oWidth || aWindow.outerHeight != oHeight;
}
function sizeChangeTest() {
function changeTest() {
is(aWindow.innerWidth, originalWidth, "Window width shouldn't have changed");
is(aWindow.innerHeight, originalHeight, "Window height shouldn't have changed");
}
function posChangeCondition() {
return aWindow.screenX != originalX || aWindow.screenY != originalY;
}
function posChangeTest() {
is(aWindow.screenX, originalX, "Window x position shouldn't have changed");
is(aWindow.screenY, originalY, "Window y position shouldn't have changed");
}
function outerChangeCondition() {
return aWindow.outerWidth != oWidth || aWindow.outerHeight != oHeight;
}
function outerChangeTest() {
is(aWindow.outerWidth, oWidth, "Window outerWidth shouldn't have changed");
is(aWindow.outerHeight, oHeight, "Window outerHeight shouldn't have changed");
}
/**
* Size checks.
* Size changes.
*/
aWindow.innerWidth = getNewWidth(aWindow);
aWindow.innerHeight = getNewHeight(aWindow);
hitEventLoop(sizeChangeCondition, sizeChangeTest, hits, function () {
aWindow.resizeTo(getNewWidth(aWindow), getNewHeight(aWindow));
var newWidth = getNewWidth(aWindow);
var newHeight = getNewHeight(aWindow);
hitEventLoop(sizeChangeCondition, sizeChangeTest, hits, function () {
aWindow.resizeBy(getNewWidth(aWindow) - aWindow.innerWidth,
getNewHeight(aWindow) - aWindow.innerHeight);
aWindow.innerWidth = newWidth;
aWindow.innerHeight = newHeight;
hitEventLoop(sizeChangeCondition, sizeChangeTest, hits, function () {
aWindow.sizeToContent();
aWindow.resizeTo(newWidth, newHeight);
aWindow.resizeBy(newWidth - aWindow.innerWidth,
newHeight - aWindow.innerHeight);
aWindow.sizeToContent();
hitEventLoop(sizeChangeCondition, sizeChangeTest, hits, function () {
/**
* Position checks.
*/
aWindow.screenX = getNewX(aWindow);
aWindow.screenY = getNewY(aWindow);
hitEventLoop(posChangeCondition, posChangeTest, hits, function () {
aWindow.moveTo(getNewX(aWindow), getNewY(aWindow));
hitEventLoop(posChangeCondition, posChangeTest, hits, function () {
aWindow.moveBy(getNewX(aWindow) - aWindow.screenX,
getNewY(aWindow) - aWindow.screenY);
hitEventLoop(posChangeCondition, posChangeTest, hits, function () {
var newX = getNewX(aWindow);
var newY = getNewY(aWindow);
aWindow.screenX = newX;
aWindow.screenY = newY;
aWindow.moveTo(newX, newY);
aWindow.moveBy(newX - aWindow.screenX,
newY - aWindow.screenY);
/**
* Outer width/height checks.
*/
aWindow.outerWidth *= 2;
aWindow.outerHeight *= 2;
aWindow.outerWidth *= 2;
aWindow.outerHeight *= 2;
hitEventLoop(outerChangeCondition, outerChangeTest, hits, aNext);
});
});
});
});
});
});
});
// We did a lot of changes. Now, we are going to wait and see if something
// happens.
// NOTE: if this happens to fail, you will have to check manually which
// operation has been accepted.
hitEventLoop(changeCondition, changeTest, hits, aNext);
}
function checkChangeIsEnabled(aWindow, aNext)

23
editor/libeditor/html/nsHTMLEditRules.cpp
View File

@ -6771,19 +6771,21 @@ nsHTMLEditRules::ReturnInListItem(nsISelection *aSelection,
NS_PRECONDITION(PR_TRUE == nsHTMLEditUtils::IsListItem(aListItem),
"expected a list item and didn't get one");
// get the listitem parent and the active editing host.
nsIContent* rootContent = mHTMLEditor->GetActiveEditingHost();
nsCOMPtr<nsIDOMNode> rootNode = do_QueryInterface(rootContent);
nsCOMPtr<nsIDOMNode> list;
PRInt32 itemOffset;
res = nsEditor::GetNodeLocation(aListItem, address_of(list), &itemOffset);
NS_ENSURE_SUCCESS(res, res);
// if we are in an empty listitem, then we want to pop up out of the list
// but only if prefs says it's ok and if the parent isn't the active editing host.
PRBool isEmpty;
res = IsEmptyBlock(aListItem, &isEmpty, PR_TRUE, PR_FALSE);
NS_ENSURE_SUCCESS(res, res);
if (isEmpty && mReturnInEmptyLIKillsList) // but only if prefs says it's ok
if (isEmpty && (rootNode != list) && mReturnInEmptyLIKillsList)
{
nsCOMPtr<nsIDOMNode> list, listparent;
PRInt32 offset, itemOffset;
res = nsEditor::GetNodeLocation(aListItem, address_of(list), &itemOffset);
NS_ENSURE_SUCCESS(res, res);
res = nsEditor::GetNodeLocation(list, address_of(listparent), &offset);
NS_ENSURE_SUCCESS(res, res);
// are we the last list item in the list?
PRBool bIsLast;
res = mHTMLEditor->IsLastEditableChild(aListItem, &bIsLast);
@ -6795,7 +6797,12 @@ nsHTMLEditRules::ReturnInListItem(nsISelection *aSelection,
res = mHTMLEditor->SplitNode(list, itemOffset, getter_AddRefs(tempNode));
NS_ENSURE_SUCCESS(res, res);
}
// are we in a sublist?
nsCOMPtr<nsIDOMNode> listparent;
PRInt32 offset;
res = nsEditor::GetNodeLocation(list, address_of(listparent), &offset);
NS_ENSURE_SUCCESS(res, res);
if (nsHTMLEditUtils::IsList(listparent)) //in a sublist
{
// if so, move this list item out of this list and into the grandparent list

3
editor/libeditor/html/tests/Makefile.in
View File

@ -55,7 +55,7 @@ _TEST_FILES = \
test_bug417418.html \
test_bug432225.html \
test_bug439808.html \
test_bug449243.html \
test_bug449243.html \
test_bug455992.html \
test_bug456244.html \
test_bug460740.html \
@ -81,6 +81,7 @@ _TEST_FILES = \
test_bug629845.html \
test_bug640321.html \
test_bug668599.html \
test_bug674861.html \
test_CF_HTML_clipboard.html \
test_contenteditable_focus.html \
test_htmleditor_keyevent_handling.html \

120
editor/libeditor/html/tests/test_bug674861.html Normal file
View File

@ -0,0 +1,120 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=674861
-->
<head>
<title>Test for Bug 674861</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=674861">Mozilla Bug 674861</a>
<p id="display"></p>
<div id="content">
<h2> Bullet List </h2>
<ul contenteditable>
<li> item 1 </li>
<li> item 2 </li>
<li> item 3 </li>
</ul>
<h2> Ordered List </h2>
<ol contenteditable>
<li> item 1 </li>
<li> item 2 </li>
<li> item 3 </li>
</ol>
<h2> Definition List </h2>
<dl contenteditable>
<dt> term 1 </dt>
<dd> definition 1 </dd>
<dt> term 2 </dt>
<dd> definition 2 </dd>
<dt> term 3 </dt>
<dd> definition 3 </dd>
</dl>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 674861 **/
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(runTests);
const CARET_BEGIN = 0;
const CARET_MIDDLE = 1;
const CARET_END = 2;
function try2split(element, caretPos) {
// compute the requested position
var len = element.textContent.length;
var pos = -1;
switch (caretPos) {
case CARET_BEGIN:
pos = 0;
break;
case CARET_MIDDLE:
pos = Math.floor(len/2);
break;
case CARET_END:
pos = len;
break;
}
// put the caret on the requested position
var sel = window.getSelection();
for (var i = 0; i < sel.rangeCount; i++) {
var range = sel.getRangeAt(i);
sel.removeRange(range);
}
range = document.createRange();
range.setStart(element.firstChild, pos);
range.setEnd(element.firstChild, pos);
sel.addRange(range);
// simulates two [Return] keypresses
synthesizeKey("VK_RETURN", {});
synthesizeKey("VK_RETURN", {});
}
function runTests() {
const ul = document.querySelector("#content ul");
const ol = document.querySelector("#content ol");
const dl = document.querySelector("#content dl");
// bullet list
ul.focus();
try2split(ul.querySelector("li"), CARET_END);
is(document.querySelectorAll("#content ul").length, 1,
"The <ul> list should not be splittable.");
is(ul.querySelectorAll("li").length, 5,
"Two new <li> elements should have been created.");
// ordered list
ol.focus();
try2split(ol.querySelector("li"), CARET_END);
is(document.querySelectorAll("#content ol").length, 1,
"The <ol> list should not be splittable.");
is(ol.querySelectorAll("li").length, 5,
"Two new <li> elements should have been created.");
// definition list
dl.focus();
try2split(dl.querySelector("dd"), CARET_END);
is(document.querySelectorAll("#content dl").length, 1,
"The <dl> list should not be splittable.");
is(dl.querySelectorAll("dt").length, 5,
"Two new <dt> elements should have been created.");
// done
SimpleTest.finish();
}
</script>
</pre>
</body>
</html>

2
embedding/android/GeckoAppShell.java
View File

@ -1167,7 +1167,7 @@ public class GeckoAppShell
public static void putChildInBackground() {
try {
File cgroupFile = new File("/proc" + android.os.Process.myPid() + "/cgroup");
File cgroupFile = new File("/proc/" + android.os.Process.myPid() + "/cgroup");
BufferedReader br = new BufferedReader(new FileReader(cgroupFile));
String[] cpuLine = br.readLine().split("/");
br.close();

11
extensions/spellcheck/hunspell/tests/suggestiontest/Makefile.orig
View File

@ -1,11 +0,0 @@
all:
./prepare
./test
single:
./prepare2
./test
clean:
rm *.[1-5] result.*

137
gfx/2d/BasePoint3D.h Normal file
View File

@ -0,0 +1,137 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Corporation code.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Matt Woodrow <mwoodrow@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef MOZILLA_BASEPOINT3D_H_
#define MOZILLA_BASEPOINT3D_H_
namespace mozilla {
namespace gfx {
/**
* Do not use this class directly. Subclass it, pass that subclass as the
* Sub parameter, and only use that subclass. This allows methods to safely
* cast 'this' to 'Sub*'.
*/
template <class T, class Sub>
struct BasePoint3D {
T x, y, z;
// Constructors
BasePoint3D() : x(0), y(0), z(0) {}
BasePoint3D(T aX, T aY, T aZ) : x(aX), y(aY), z(aZ) {}
void MoveTo(T aX, T aY, T aZ) { x = aX; y = aY; z = aZ; }
void MoveBy(T aDx, T aDy, T aDz) { x += aDx; y += aDy; z += aDz; }
// Note that '=' isn't defined so we'll get the
// compiler generated default assignment operator
bool operator==(const Sub& aPoint) const {
return x == aPoint.x && y == aPoint.y && z == aPoint.z;
}
bool operator!=(const Sub& aPoint) const {
return x != aPoint.x || y != aPoint.y || z != aPoint.z;
}
Sub operator+(const Sub& aPoint) const {
return Sub(x + aPoint.x, y + aPoint.y, z + aPoint.z);
}
Sub operator-(const Sub& aPoint) const {
return Sub(x - aPoint.x, y - aPoint.y, z - aPoint.z);
}
Sub& operator+=(const Sub& aPoint) {
x += aPoint.x;
y += aPoint.y;
z += aPoint.z;
return *static_cast<Sub*>(this);
}
Sub& operator-=(const Sub& aPoint) {
x -= aPoint.x;
y -= aPoint.y;
z -= aPoint.z;
return *static_cast<Sub*>(this);
}
Sub operator*(T aScale) const {
return Sub(x * aScale, y * aScale, z * aScale);
}
Sub operator/(T aScale) const {
return Sub(x / aScale, y / aScale, z / aScale);
}
Sub& operator*=(T aScale) {
x *= aScale;
y *= aScale;
z *= aScale;
return *static_cast<Sub*>(this);
}
Sub& operator/=(T aScale) {
x /= aScale;
y /= aScale;
z /= aScale;
return *static_cast<Sub*>(this);
}
Sub operator-() const {
return Sub(-x, -y, -z);
}
Sub CrossProduct(const Sub& aPoint) const {
return Sub(y * aPoint.z - aPoint.y * z,
z * aPoint.x - aPoint.z * x,
x * aPoint.y - aPoint.x * y);
}
T DotProduct(const Sub& aPoint) const {
return x * aPoint.x + y * aPoint.y + z * aPoint.z;
}
T Length() const {
return sqrt(x*x + y*y + z*z);
}
// Invalid for points with distance from origin of 0.
void Normalize() {
*this /= Length();
}
};
}
}
#endif /* MOZILLA_BASEPOINT3D_H_ */

1
gfx/2d/Makefile.in
View File

@ -51,6 +51,7 @@ EXPORTS_NAMESPACES = mozilla/gfx
EXPORTS_mozilla/gfx = \
2D.h \
BasePoint.h \
BasePoint3D.h \
BaseMargin.h \
BaseRect.h \
BaseSize.h \

4
gfx/cairo/cairo/src/cairo-quartz-surface.c
View File

@ -1106,6 +1106,7 @@ DataProviderReleaseCallback (void *info, const void *data, size_t size)
{
quartz_source_image_t *source_img = info;
_cairo_surface_release_source_image (source_img->surface, source_img->image_out, source_img->image_extra);
cairo_surface_destroy (source_img->surface);
free (source_img);
}
@ -1145,10 +1146,11 @@ _cairo_surface_to_cgimage (cairo_surface_t *source,
if (source_img == NULL)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
source_img->surface = source;
source_img->surface = cairo_surface_reference(source);
status = _cairo_surface_acquire_source_image (source_img->surface, &source_img->image_out, &source_img->image_extra);
if (status) {
cairo_surface_destroy (source_img->surface);
free (source_img);
return status;
}

4
gfx/layers/Layers.cpp
View File

@ -421,7 +421,9 @@ ContainerLayer::DefaultComputeEffectiveTransforms(const gfx3DMatrix& aTransformT
} else {
useIntermediateSurface = PR_FALSE;
gfxMatrix contTransform;
if (!mEffectiveTransform.Is2D(&contTransform) ||
if (!mEffectiveTransform.Is2D(&contTransform)) {
useIntermediateSurface = PR_TRUE;
} else if (
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
!contTransform.PreservesAxisAlignedRectangles()) {
#else

2
gfx/layers/d3d10/LayerManagerD3D10.cpp
View File

@ -490,7 +490,7 @@ LayerManagerD3D10::SetViewport(const nsIntSize &aViewport)
*/
projection._11 = 2.0f / aViewport.width;
projection._22 = -2.0f / aViewport.height;
projection._33 = 1.0f;
projection._33 = 0.0f;
projection._41 = -1.0f;
projection._42 = 1.0f;
projection._44 = 1.0f;

1
gfx/layers/d3d9/LayerManagerD3D9.cpp
View File

@ -371,6 +371,7 @@ LayerManagerD3D9::SetupPipeline()
*/
viewMatrix._11 = 2.0f / rect.width;
viewMatrix._22 = -2.0f / rect.height;
viewMatrix._33 = 0.0f;
viewMatrix._41 = -1.0f;
viewMatrix._42 = 1.0f;

5
gfx/layers/opengl/LayerManagerOGL.cpp
View File

@ -945,7 +945,10 @@ LayerManagerOGL::SetupPipeline(int aWidth, int aHeight, WorldTransforPolicy aTra
viewMatrix = mWorldMatrix * viewMatrix;
}
SetLayerProgramProjectionMatrix(gfx3DMatrix::From2D(viewMatrix));
gfx3DMatrix matrix3d = gfx3DMatrix::From2D(viewMatrix);
matrix3d._33 = 0.0f;
SetLayerProgramProjectionMatrix(matrix3d);
}
void

2
gfx/tests/reftest/reftest.list
View File

@ -1,3 +1,3 @@
# 468496-1 will also detect bugs in video drivers.
fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) fails-if(Android) == 468496-1.html 468496-1-ref.html # bug 486761, 660740
fails-if(/Mac\x20OS\x20X\x2010\.5/.test(http.oscpu)) == 468496-1.html 468496-1-ref.html # bug 486761, 660740
== 611498-1.html 611498-ref.html

1
gfx/thebes/Makefile.in
View File

@ -32,6 +32,7 @@ EXPORTS = \
gfxPattern.h \
gfxPlatform.h \
gfxPoint.h \
gfxPoint3D.h \
gfxRect.h \
gfxSkipChars.h \
gfxTeeSurface.h \

102
gfx/thebes/gfx3DMatrix.cpp
View File

@ -147,6 +147,17 @@ gfx3DMatrix::Translation(float aX, float aY, float aZ)
return matrix;
}
gfx3DMatrix
gfx3DMatrix::Translation(const gfxPoint3D& aPoint)
{
gfx3DMatrix matrix;
matrix._41 = aPoint.x;
matrix._42 = aPoint.y;
matrix._43 = aPoint.z;
return matrix;
}
gfx3DMatrix
gfx3DMatrix::Scale(float aFactor)
{
@ -269,13 +280,24 @@ gfx3DMatrix::Invert()
gfxPoint
gfx3DMatrix::Transform(const gfxPoint& point) const
{
gfxFloat x = point.x * _11 + point.y * _21 + _41;
gfxFloat y = point.x * _12 + point.y * _22 + _42;
gfxFloat w = point.x * _14 + point.y * _24 + _44;
gfxPoint3D vec3d(point.x, point.y, 0);
vec3d = Transform3D(vec3d);
return gfxPoint(vec3d.x, vec3d.y);
}
gfxPoint3D
gfx3DMatrix::Transform3D(const gfxPoint3D& point) const
{
gfxFloat x = point.x * _11 + point.y * _21 + point.z * _31 + _41;
gfxFloat y = point.x * _12 + point.y * _22 + point.z * _32 + _42;
gfxFloat z = point.x * _13 + point.y * _23 + point.z * _33 + _43;
gfxFloat w = point.x * _14 + point.y * _24 + point.z * _34 + _44;
x /= w;
y /= w;
/* Assume z is 0! */
return gfxPoint(x, y);
z /= w;
return gfxPoint3D(x, y, z);
}
gfxRect
@ -325,3 +347,73 @@ gfx3DMatrix::Is2D(gfxMatrix* aMatrix) const
return PR_TRUE;
}
gfxPoint gfx3DMatrix::ProjectPoint(const gfxPoint& aPoint) const
{
// Define a ray of the form P + Ut where t is a real number
// w is assumed to always be 1 when transforming 3d points with our
// 4x4 matrix.
// p is our click point, q is another point on the same ray.
//
// Note: since the transformation is a general projective transformation and is not
// necessarily affine, we can't just take a unit vector u, back-transform it, and use
// it as unit vector on the back-transformed ray. Instead, we really must take two points
// on the ray and back-transform them.
gfxPoint3D p(aPoint.x, aPoint.y, 0);
gfxPoint3D q(aPoint.x, aPoint.y, 1);
// Back transform the vectors (using w = 1) and normalize
// back into 3d vectors by dividing by the w component.
gfxPoint3D pback = Transform3D(p);
gfxPoint3D qback = Transform3D(q);
gfxPoint3D uback = qback - pback;
// Find the point where the back transformed line intersects z=0
// and find t.
float t = -pback.z / uback.z;
gfxPoint result(pback.x + t*uback.x, pback.y + t*uback.y);
return result;
}
gfxRect gfx3DMatrix::ProjectRectBounds(const gfxRect& aRect) const
{
gfxPoint points[4];
points[0] = ProjectPoint(aRect.TopLeft());
points[1] = ProjectPoint(gfxPoint(aRect.X() + aRect.Width(), aRect.Y()));
points[2] = ProjectPoint(gfxPoint(aRect.X(), aRect.Y() + aRect.Height()));
points[3] = ProjectPoint(gfxPoint(aRect.X() + aRect.Width(),
aRect.Y() + aRect.Height()));
gfxFloat min_x, max_x;
gfxFloat min_y, max_y;
min_x = max_x = points[0].x;
min_y = max_y = points[0].y;
for (int i=1; i<4; i++) {
min_x = min(points[i].x, min_x);
max_x = max(points[i].x, max_x);
min_y = min(points[i].y, min_y);
max_y = max(points[i].y, max_y);
}
return gfxRect(min_x, min_y, max_x - min_x, max_y - min_y);
}
gfxPoint3D gfx3DMatrix::GetNormalVector() const
{
// Define a plane in transformed space as the transformations
// of 3 points on the z=0 screen plane.
gfxPoint3D a = Transform3D(gfxPoint3D(0, 0, 0));
gfxPoint3D b = Transform3D(gfxPoint3D(0, 1, 0));
gfxPoint3D c = Transform3D(gfxPoint3D(1, 0, 0));
// Convert to two vectors on the surface of the plane.
gfxPoint3D ab = b - a;
gfxPoint3D ac = c - a;
return ac.CrossProduct(ab);
}

24
gfx/thebes/gfx3DMatrix.h
View File

@ -40,6 +40,7 @@
#define GFX_3DMATRIX_H
#include <gfxTypes.h>
#include <gfxPoint3D.h>
#include <gfxMatrix.h>
/**
@ -111,12 +112,34 @@ public:
*/
gfxRect TransformBounds(const gfxRect& rect) const;
/**
* Transforms a 3D vector according to this matrix.
*/
gfxPoint3D Transform3D(const gfxPoint3D& point) const;
gfxPoint ProjectPoint(const gfxPoint& aPoint) const;
gfxRect ProjectRectBounds(const gfxRect& aRect) const;
/**
* Inverts this matrix, if possible. Otherwise, the matrix is left
* unchanged.
*/
gfx3DMatrix& Invert();
inline gfx3DMatrix Inverse() const
{
gfx3DMatrix temp = *this;
temp.Invert();
return temp;
}
/**
* Returns a unit vector that is perpendicular to the plane formed
* by transform the screen plane (z=0) by this matrix.
*/
gfxPoint3D GetNormalVector() const;
/**
* Check if matrix is singular (no inverse exists).
*/
@ -130,6 +153,7 @@ public:
* \param aZ Translation on Z-axis.
*/
static gfx3DMatrix Translation(float aX, float aY, float aZ);
static gfx3DMatrix Translation(const gfxPoint3D& aPoint);
/**
* Create a scale matrix. Scales uniformly along all axes.

5
gfx/thebes/gfxDrawable.cpp
View File

@ -158,11 +158,6 @@ gfxSurfaceDrawable::Draw(gfxContext* aContext,
PreparePatternForUntiledDrawing(pattern, deviceSpaceToImageSpace,
currentTarget, filter);
}
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
if (!mozilla::supports_neon()) {
pattern->SetFilter(gfxPattern::FILTER_FAST);
}
#endif
pattern->SetMatrix(gfxMatrix(aTransform).Multiply(mTransform));
aContext->NewPath();
aContext->SetPattern(pattern);

51
gfx/thebes/gfxPoint3D.h Normal file
View File

@ -0,0 +1,51 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Oracle Corporation code.
*
* The Initial Developer of the Original Code is Oracle Corporation.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Matt Woodrow <mwoodrow@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef GFX_POINT3D_H
#define GFX_POINT3D_H
#include "mozilla/gfx/BasePoint3D.h"
#include "gfxTypes.h"
struct THEBES_API gfxPoint3D : public mozilla::gfx::BasePoint3D<gfxFloat, gfxPoint3D> {
typedef mozilla::gfx::BasePoint3D<gfxFloat, gfxPoint3D> Super;
gfxPoint3D() : Super() {}
gfxPoint3D(gfxFloat aX, gfxFloat aY, gfxFloat aZ) : Super(aX, aY, aZ) {}
};
#endif /* GFX_POINT3D_H */

1
intl/locale/src/charsetalias.properties
View File

@ -113,6 +113,7 @@ gb2312=GB2312
gb18030=gb18030
viscii=VISCII
koi8-r=KOI8-R
koi8_r=KOI8-R
koi8-u=KOI8-U
tis-620=TIS-620
t.61-8bit=T.61-8bit

11
js/src/jit-test/tests/basic/testBug663789-2.js
View File

@ -1,11 +1,6 @@
// |jit-test| debug;mjit
/*
* NOTE: this evalInFrame is explicitly exposing an optimization artifact that
* InvokeSessionGuard leaves the callee frame on the stack between invocations.
* If this ever gets fixed or InvokeSessionGuard gets removed, this test will
* fail and it can be removed.
*/
o = { toString:function() { return evalInFrame(1, "arguments; x") } }
o = { toString:function() { return evalInFrame(1, "x") } }
var x = 'C';
var s = "aaaaaaaaaa".replace(/a/g, function() { var x = 'B'; return o });
assertEq(s, "BBBBBBBBBB");
assertEq(s, "CCCCCCCCCC");

6
js/src/jsapi.cpp
View File

@ -4473,7 +4473,7 @@ CompileUCScriptForPrincipalsCommon(JSContext *cx, JSObject *obj, JSPrincipals *p
if (script) {
scriptObj = js_NewScriptObject(cx, script);
if (!scriptObj)
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 3);
}
LAST_FRAME_CHECKS(cx, scriptObj);
return scriptObj;
@ -4660,7 +4660,7 @@ CompileFileHelper(JSContext *cx, JSObject *obj, JSPrincipals *principals,
JSObject *scriptObj = js_NewScriptObject(cx, script);
if (!scriptObj)
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 4);
return scriptObj;
}
@ -4967,7 +4967,7 @@ EvaluateUCScriptForPrincipalsCommon(JSContext *cx, JSObject *obj,
bool ok = ExternalExecute(cx, script, *obj, Valueify(rval));
LAST_FRAME_CHECKS(cx, ok);
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 5);
return ok;
}

2
js/src/jsdbgapi.cpp
View File

@ -1125,7 +1125,7 @@ JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fpArg,
bool ok = Execute(cx, script, *scobj, fp->thisValue(), EXECUTE_DEBUG, fp, Valueify(rval));
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 6);
return ok;
}

13
js/src/jsfun.cpp
View File

@ -1586,8 +1586,14 @@ js_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
fun->u.i.wrapper = JSPackedBool((firstword >> 1) & 1);
}
if (!js_XDRScript(xdr, &fun->u.i.script))
/*
* Don't directly store into fun->u.i.script because we want this to happen
* at the same time as we set the script's owner.
*/
JSScript *script = fun->u.i.script;
if (!js_XDRScript(xdr, &script))
return false;
fun->u.i.script = script;
if (xdr->mode == JSXDR_DECODE) {
*objp = FUN_OBJECT(fun);
@ -2474,9 +2480,10 @@ js_CloneFunctionObject(JSContext *cx, JSFunction *fun, JSObject *parent,
JS_ASSERT(script->compartment != cx->compartment);
JS_OPT_ASSERT(script->ownerObject == fun);
cfun->u.i.script = js_CloneScript(cx, script);
if (!cfun->script())
JSScript *cscript = js_CloneScript(cx, script);
if (!cscript)
return NULL;
cfun->u.i.script = cscript;
cfun->script()->setOwnerObject(cfun);
#ifdef CHECK_SCRIPT_OWNER
cfun->script()->owner = NULL;

3
js/src/jsinterp.cpp
View File

@ -709,6 +709,9 @@ InvokeSessionGuard::start(JSContext *cx, const Value &calleev, const Value &this
savedCallee_ = args_.calleev() = calleev;
savedThis_ = args_.thisv() = thisv;
/* If anyone (through jsdbgapi) finds this frame, make it safe. */
MakeRangeGCSafe(args_.argv(), args_.argc());
do {
/* Hoist dynamic checks from scripted Invoke. */
if (!calleev.isObject())

2
js/src/jsparse.cpp
View File

@ -1142,7 +1142,7 @@ Compiler::compileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
late_error:
if (script) {
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 7);
script = NULL;
}
goto out;

21
js/src/jsscript.cpp
View File

@ -754,7 +754,7 @@ js_XDRScript(JSXDRState *xdr, JSScript **scriptp)
error:
if (xdr->mode == JSXDR_DECODE) {
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 1);
*scriptp = NULL;
}
xdr->script = oldscript;
@ -1270,7 +1270,7 @@ JSScript::NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg)
return script;
bad:
js_DestroyScript(cx, script);
js_DestroyScript(cx, script, 2);
return NULL;
}
@ -1345,7 +1345,7 @@ CheckCompartmentScripts(JSCompartment *comp)
} /* namespace js */
static void
DestroyScript(JSContext *cx, JSScript *script, JSObject *owner)
DestroyScript(JSContext *cx, JSScript *script, JSObject *owner, uint32 caller)
{
CheckScript(script, NULL);
CheckScriptOwner(script, owner);
@ -1408,16 +1408,17 @@ DestroyScript(JSContext *cx, JSScript *script, JSObject *owner)
if (script->sourceMap)
cx->free_(script->sourceMap);
memset(script, JS_FREE_PATTERN, script->totalSize());
memset(script, 0xdb, script->totalSize());
*(uint32 *)script = caller;
cx->free_(script);
}
void
js_DestroyScript(JSContext *cx, JSScript *script)
js_DestroyScript(JSContext *cx, JSScript *script, uint32 caller)
{
JS_ASSERT(!cx->runtime->gcRunning);
js_CallDestroyScriptHook(cx, script);
DestroyScript(cx, script, JS_NEW_SCRIPT);
DestroyScript(cx, script, JS_NEW_SCRIPT, caller);
}
void
@ -1425,14 +1426,14 @@ js_DestroyScriptFromGC(JSContext *cx, JSScript *script, JSObject *owner)
{
JS_ASSERT(cx->runtime->gcRunning);
js_CallDestroyScriptHook(cx, script);
DestroyScript(cx, script, owner);
DestroyScript(cx, script, owner, 100);
}
void
js_DestroyCachedScript(JSContext *cx, JSScript *script)
{
JS_ASSERT(cx->runtime->gcRunning);
DestroyScript(cx, script, JS_CACHED_SCRIPT);
DestroyScript(cx, script, JS_CACHED_SCRIPT, 101);
}
void
@ -1471,6 +1472,10 @@ js_TraceScript(JSTracer *trc, JSScript *script, JSObject *owner)
js_MarkScriptFilename(script->filename);
script->bindings.trace(trc);
#ifdef JS_METHODJIT
mjit::TraceScript(trc, script);
#endif
}
JSObject *

2
js/src/jsscript.h
View File

@ -733,7 +733,7 @@ js_CallDestroyScriptHook(JSContext *cx, JSScript *script);
* only on the current thread.
*/
extern void
js_DestroyScript(JSContext *cx, JSScript *script);
js_DestroyScript(JSContext *cx, JSScript *script, uint32 caller);
extern void
js_DestroyScriptFromGC(JSContext *cx, JSScript *script, JSObject *owner);

11
js/src/jsutil.cpp
View File

@ -70,19 +70,26 @@ JS_STATIC_ASSERT(sizeof(void *) == sizeof(void (*)()));
static JS_NEVER_INLINE void
CrashInJS()
{
/*
* We write 123 here so that the machine code for this function is
* unique. Otherwise the linker, trying to be smart, might use the
* same code for CrashInJS and for some other function. That
* messes up the signature in minidumps.
*/
#if defined(WIN32)
/*
* We used to call DebugBreak() on Windows, but amazingly, it causes
* the MSVS 2010 debugger not to be able to recover a call stack.
*/
*((int *) NULL) = 0;
*((int *) NULL) = 123;
exit(3);
#elif defined(__APPLE__)
/*
* On Mac OS X, Breakpad ignores signals. Only real Mach exceptions are
* trapped.
*/
*((int *) NULL) = 0; /* To continue from here in GDB: "return" then "continue". */
*((int *) NULL) = 123; /* To continue from here in GDB: "return" then "continue". */
raise(SIGABRT); /* In case above statement gets nixed by the optimizer. */
#else
raise(SIGABRT); /* To continue from here in GDB: "signal 0". */

2
js/src/jsxdrapi.cpp
View File

@ -720,7 +720,7 @@ JS_XDRScriptObject(JSXDRState *xdr, JSObject **scriptObjp)
js_CallNewScriptHook(xdr->cx, script, NULL);
*scriptObjp = js_NewScriptObject(xdr->cx, script);
if (!*scriptObjp) {
js_DestroyScript(xdr->cx, script);
js_DestroyScript(xdr->cx, script, 8);
return false;
}
}

17
js/src/methodjit/Compiler.cpp
View File

@ -113,6 +113,7 @@ mjit::Compiler::Compiler(JSContext *cx, StackFrame *fp)
doubleList(CompilerAllocPolicy(cx, *thisFromCtor())),
jumpTables(CompilerAllocPolicy(cx, *thisFromCtor())),
jumpTableOffsets(CompilerAllocPolicy(cx, *thisFromCtor())),
rootedObjects(CompilerAllocPolicy(cx, *thisFromCtor())),
stubcc(cx, *thisFromCtor(), frame, script),
debugMode_(cx->compartment->debugMode),
#if defined JS_TRACER
@ -457,7 +458,8 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
sizeof(ic::GetElementIC) * getElemICs.length() +
sizeof(ic::SetElementIC) * setElemICs.length() +
#endif
sizeof(CallSite) * callSites.length();
sizeof(CallSite) * callSites.length() +
sizeof(JSObject *) * rootedObjects.length();
uint8 *cursor = (uint8 *)cx->calloc_(dataSize);
if (!cursor) {
@ -820,6 +822,13 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
to.initialize(codeOffset, from.pc - script->code, from.id);
}
/* Build the list of objects rooted by the script. */
JSObject **jitRooted = (JSObject **)cursor;
jit->nRootedObjects = rootedObjects.length();
cursor += sizeof(JSObject *) * jit->nRootedObjects;
for (size_t i = 0; i < jit->nRootedObjects; i++)
jitRooted[i] = rootedObjects[i];
JS_ASSERT(size_t(cursor - (uint8*)jit) == dataSize);
*jitp = jit;
@ -3241,6 +3250,12 @@ mjit::Compiler::jsop_callprop_str(JSAtom *atom)
if (!js_GetClassPrototype(cx, &fp->scopeChain(), JSProto_String, &obj))
return false;
/*
* Root the proto, since JS_ClearScope might overwrite the global object's
* copy.
*/
rootedObjects.append(obj);
/* Force into a register because getprop won't expect a constant. */
RegisterID reg = frame.allocReg();

1
js/src/methodjit/Compiler.h
View File

@ -358,6 +358,7 @@ class Compiler : public BaseCompiler
js::Vector<DoublePatch, 16, CompilerAllocPolicy> doubleList;
js::Vector<JumpTable, 16> jumpTables;
js::Vector<uint32, 16> jumpTableOffsets;
js::Vector<JSObject *, 0, CompilerAllocPolicy> rootedObjects;
StubCompiler stubcc;
Label invokeLabel;
Label arityLabel;

35
js/src/methodjit/MethodJIT.cpp
View File

@ -40,6 +40,7 @@
#include "Logging.h"
#include "assembler/jit/ExecutableAllocator.h"
#include "jstracer.h"
#include "jsgcmark.h"
#include "BaseAssembler.h"
#include "Compiler.h"
#include "MonoIC.h"
@ -752,7 +753,7 @@ JITScript::nmap() const
char *
JITScript::nmapSectionLimit() const
{
return (char *)nmap() + sizeof(NativeMapEntry) * nNmapPairs;
return (char *)&nmap()[nNmapPairs];
}
#ifdef JS_MONOIC
@ -772,26 +773,25 @@ JITScript::setGlobalNames() const
ic::CallICInfo *
JITScript::callICs() const
{
return (ic::CallICInfo *)((char *)setGlobalNames() +
sizeof(ic::SetGlobalNameIC) * nSetGlobalNames);
return (ic::CallICInfo *)&setGlobalNames()[nSetGlobalNames];
}
ic::EqualityICInfo *
JITScript::equalityICs() const
{
return (ic::EqualityICInfo *)((char *)callICs() + sizeof(ic::CallICInfo) * nCallICs);
return (ic::EqualityICInfo *)&callICs()[nCallICs];
}
ic::TraceICInfo *
JITScript::traceICs() const
{
return (ic::TraceICInfo *)((char *)equalityICs() + sizeof(ic::EqualityICInfo) * nEqualityICs);
return (ic::TraceICInfo *)&equalityICs()[nEqualityICs];
}
char *
JITScript::monoICSectionsLimit() const
{
return (char *)traceICs() + sizeof(ic::TraceICInfo) * nTraceICs;
return (char *)&traceICs()[nTraceICs];
}
#else // JS_MONOIC
char *
@ -839,6 +839,12 @@ JITScript::callSites() const
return (js::mjit::CallSite *)polyICSectionsLimit();
}
JSObject **
JITScript::rootedObjects() const
{
return (JSObject **)&callSites()[nCallSites];
}
template <typename T>
static inline void Destroy(T &t)
{
@ -875,6 +881,13 @@ mjit::JITScript::~JITScript()
#endif
}
void
mjit::JITScript::trace(JSTracer *trc)
{
for (uint32 i = 0; i < nRootedObjects; ++i)
MarkObject(trc, *rootedObjects()[i], "mjit rooted object");
}
size_t
JSScript::jitDataSize()
{
@ -930,6 +943,16 @@ mjit::ReleaseScriptCode(JSContext *cx, JSScript *script)
}
}
void
mjit::TraceScript(JSTracer *trc, JSScript *script)
{
if (JITScript *jit = script->jitNormal)
jit->trace(trc);
if (JITScript *jit = script->jitCtor)
jit->trace(trc);
}
#ifdef JS_METHODJIT_PROFILE_STUBS
void JS_FASTCALL
mjit::ProfileStubCall(VMFrame &f)

7
js/src/methodjit/MethodJIT.h
View File

@ -382,6 +382,7 @@ struct JITScript {
uint32 nPICs;
#endif
uint32 nCallSites;
uint32 nRootedObjects;
#ifdef JS_MONOIC
// Additional ExecutablePools that IC stubs were generated into.
@ -403,6 +404,7 @@ struct JITScript {
ic::PICInfo *pics() const;
#endif
js::mjit::CallSite *callSites() const;
JSObject **rootedObjects() const;
~JITScript();
@ -417,6 +419,8 @@ struct JITScript {
void purgeMICs();
void purgePICs();
void trace(JSTracer *trc);
size_t scriptDataSize();
jsbytecode *nativeToPC(void *returnAddress) const;
@ -456,6 +460,9 @@ TryCompile(JSContext *cx, StackFrame *fp);
void
ReleaseScriptCode(JSContext *cx, JSScript *script);
void
TraceScript(JSTracer *trc, JSScript *script);
struct CallSite
{
uint32 codeOffset;

18
js/src/vm/Stack.cpp
View File

@ -911,6 +911,16 @@ StackIter::startOnSegment(StackSegment *seg)
settleOnNewSegment();
}
static void JS_NEVER_INLINE
CrashIfInvalidSlot(StackFrame *fp, Value *vp)
{
if (vp < fp->slots() || vp >= fp->slots() + fp->script()->nslots) {
JS_ASSERT(false && "About to dereference invalid slot");
*(int *)0xbad = 0; // show up nicely in crash-stats
JS_Assert("About to dereference invalid slot", __FILE__, __LINE__);
}
}
void
StackIter::settleOnNewState()
{
@ -963,6 +973,12 @@ StackIter::settleOnNewState()
continue;
}
/* Censor pushed-but-not-active frames from InvokeSessionGuard. */
if (containsCall && !calls_->active() && calls_->argv() == fp_->actualArgs()) {
popFrame();
continue;
}
/*
* As an optimization, there is no CallArgsList element pushed for
* natives called directly by a script (compiled or interpreted).
@ -997,6 +1013,7 @@ StackIter::settleOnNewState()
#endif
Value *vp = sp_ - (2 + argc);
CrashIfInvalidSlot(fp_, vp);
if (IsNativeFunction(*vp)) {
state_ = IMPLICIT_NATIVE;
args_ = CallArgsFromVp(argc, vp);
@ -1009,6 +1026,7 @@ StackIter::settleOnNewState()
Value *sp = fp_->base() + spoff;
Value *vp = sp - (2 + argc);
CrashIfInvalidSlot(fp_, vp);
if (IsNativeFunction(*vp)) {
if (sp_ != sp) {
JS_ASSERT(argc == 2);

35
js/src/vm/String.cpp
View File

@ -116,30 +116,31 @@ JSString::charsHeapSize()
return length() * sizeof(jschar);
}
static JS_ALWAYS_INLINE size_t
RopeCapacityFor(size_t length)
static JS_ALWAYS_INLINE bool
AllocChars(JSContext *maybecx, size_t length, jschar **chars, size_t *capacity)
{
static const size_t ROPE_DOUBLING_MAX = 1024 * 1024;
/*
* String length doesn't include the null char, so include it here before
* doubling. Adding the null char after doubling would interact poorly with
* round-up malloc schemes.
*/
size_t numChars = length + 1;
/*
* Grow by 12.5% if the buffer is very large. Otherwise, round up to the
* next power of 2. This is similar to what we do with arrays; see
* JSObject::ensureDenseArrayElements.
*/
if (length > ROPE_DOUBLING_MAX)
return length + (length / 8);
return RoundUpPow2(length);
}
static const size_t DOUBLING_MAX = 1024 * 1024;
numChars = numChars > DOUBLING_MAX ? numChars + (numChars / 8) : RoundUpPow2(numChars);
/* Like length, capacity does not include the null char, so take it out. */
*capacity = numChars - 1;
static JS_ALWAYS_INLINE jschar *
AllocChars(JSContext *maybecx, size_t wholeCapacity)
{
/* +1 for the null char at the end. */
JS_STATIC_ASSERT(JSString::MAX_LENGTH * sizeof(jschar) < UINT32_MAX);
size_t bytes = (wholeCapacity + 1) * sizeof(jschar);
if (maybecx)
return (jschar *)maybecx->malloc_(bytes);
return (jschar *)OffTheBooks::malloc_(bytes);
size_t bytes = numChars * sizeof(jschar);
*chars = (jschar *)(maybecx ? maybecx->malloc_(bytes) : OffTheBooks::malloc_(bytes));
return *chars != NULL;
}
JSFlatString *
@ -197,9 +198,7 @@ JSRope::flatten(JSContext *maybecx)
}
}
wholeCapacity = RopeCapacityFor(wholeLength);
wholeChars = AllocChars(maybecx, wholeCapacity);
if (!wholeChars)
if (!AllocChars(maybecx, wholeLength, &wholeChars, &wholeCapacity))
return NULL;
pos = wholeChars;

9
js/src/vm/String.h
View File

@ -55,8 +55,11 @@ class JSAtom;
/*
* JavaScript strings
*
* Conceptually, a JS string is just an array of chars and a length. To improve
* performance of common string operations, the following optimizations are
* Conceptually, a JS string is just an array of chars and a length. This array
* of chars may or may not be null-terminated and, if it is, the null character
* is not included in the length.
*
* To improve performance of common operations, the following optimizations are
* made which affect the engine's representation of strings:
*
* - The plain vanilla representation is a "flat" string which consists of a
@ -110,7 +113,7 @@ class JSAtom;
* | \
* | JSDependentString base / -
* |
* JSFlatString (abstract) chars / not null-terminated
* JSFlatString (abstract) chars / null-terminated
* | \
* | JSExtensibleString capacity / no external pointers into char array
* |

8
layout/base/FrameLayerBuilder.cpp
View File

@ -921,16 +921,12 @@ AppUnitsPerDevPixel(nsDisplayItem* aItem)
static void
RestrictVisibleRegionForLayer(Layer* aLayer, const nsIntRect& aItemVisible)
{
gfxMatrix transform;
if (!aLayer->GetTransform().Is2D(&transform))
return;
gfx3DMatrix transform = aLayer->GetTransform();
// if 'transform' is not invertible, then nothing will be displayed
// for the layer, so it doesn't really matter what we do here
gfxMatrix inverse = transform;
inverse.Invert();
gfxRect itemVisible(aItemVisible.x, aItemVisible.y, aItemVisible.width, aItemVisible.height);
gfxRect layerVisible = inverse.TransformBounds(itemVisible);
gfxRect layerVisible = transform.Inverse().ProjectRectBounds(itemVisible);
layerVisible.RoundOut();
nsIntRect visibleRect;

185
layout/base/nsDisplayList.cpp
View File

@ -451,19 +451,16 @@ static nsRect GetDisplayPortBounds(nsDisplayListBuilder* aBuilder,
PRBool aIgnoreTransform)
{
nsIFrame* frame = aItem->GetUnderlyingFrame();
nscoord auPerDevPixel = frame->PresContext()->AppUnitsPerDevPixel();
gfx3DMatrix transform;
const nsRect* displayport = aBuilder->GetDisplayPort();
if (!aIgnoreTransform) {
transform = nsLayoutUtils::GetTransformToAncestor(frame,
aBuilder->ReferenceFrame());
transform.Invert();
if (aIgnoreTransform) {
return *displayport;
}
const nsRect* displayport = aBuilder->GetDisplayPort();
return nsLayoutUtils::MatrixTransformRect(
return nsLayoutUtils::TransformRectToBoundsInAncestor(
frame,
nsRect(0, 0, displayport->width, displayport->height),
transform, auPerDevPixel);
aBuilder->ReferenceFrame());
}
PRBool
@ -2301,9 +2298,9 @@ nsDisplayTransform::GetFrameBoundsForTransform(const nsIFrame* aFrame)
* to get from (0, 0) of the frame to the transform origin.
*/
static
gfxPoint GetDeltaToMozTransformOrigin(const nsIFrame* aFrame,
float aFactor,
const nsRect* aBoundsOverride)
gfxPoint3D GetDeltaToMozTransformOrigin(const nsIFrame* aFrame,
float aFactor,
const nsRect* aBoundsOverride)
{
NS_PRECONDITION(aFrame, "Can't get delta for a null frame!");
NS_PRECONDITION(aFrame->GetStyleDisplay()->HasTransform(),
@ -2318,8 +2315,8 @@ gfxPoint GetDeltaToMozTransformOrigin(const nsIFrame* aFrame,
nsDisplayTransform::GetFrameBoundsForTransform(aFrame));
/* Allows us to access named variables by index. */
gfxPoint result;
gfxFloat* coords[2] = {&result.x, &result.y};
gfxPoint3D result;
gfxFloat* coords[3] = {&result.x, &result.y, &result.z};
const nscoord* dimensions[2] =
{&boundingRect.width, &boundingRect.height};
@ -2341,6 +2338,8 @@ gfxPoint GetDeltaToMozTransformOrigin(const nsIFrame* aFrame,
*coords[index] = NSAppUnitsToFloatPixels(coord.GetCoordValue(), aFactor);
}
}
*coords[2] = NSAppUnitsToFloatPixels(display->mTransformOrigin[2].GetCoordValue(), aFactor);
/* Adjust based on the origin of the rectangle. */
result.x += NSAppUnitsToFloatPixels(boundingRect.x, aFactor);
@ -2349,6 +2348,66 @@ gfxPoint GetDeltaToMozTransformOrigin(const nsIFrame* aFrame,
return result;
}
/* Returns the delta specified by the -moz-perspective-origin property.
* This is a positive delta, meaning that it indicates the direction to move
* to get from (0, 0) of the frame to the perspective origin.
*/
static
gfxPoint3D GetDeltaToMozPerspectiveOrigin(const nsIFrame* aFrame,
float aFactor,
const nsRect* aBoundsOverride)
{
NS_PRECONDITION(aFrame, "Can't get delta for a null frame!");
NS_PRECONDITION(aFrame->GetStyleDisplay()->HasTransform(),
"Can't get a delta for an untransformed frame!");
/* For both of the coordinates, if the value of -moz-perspective-origin is a
* percentage, it's relative to the size of the frame. Otherwise, if it's
* a distance, it's already computed for us!
*/
//TODO: Should this be using our bounds or the parent's bounds?
// How do we handle aBoundsOverride in the latter case?
const nsStyleDisplay* display = aFrame->GetParent()->GetStyleDisplay();
nsRect boundingRect = (aBoundsOverride ? *aBoundsOverride :
nsDisplayTransform::GetFrameBoundsForTransform(aFrame));
/* Allows us to access named variables by index. */
gfxPoint3D result;
result.z = 0.0f;
gfxFloat* coords[2] = {&result.x, &result.y};
const nscoord* dimensions[2] =
{&boundingRect.width, &boundingRect.height};
for (PRUint8 index = 0; index < 2; ++index) {
/* If the -moz-transform-origin specifies a percentage, take the percentage
* of the size of the box.
*/
const nsStyleCoord &coord = display->mPerspectiveOrigin[index];
if (coord.GetUnit() == eStyleUnit_Calc) {
const nsStyleCoord::Calc *calc = coord.GetCalcValue();
*coords[index] = NSAppUnitsToFloatPixels(*dimensions[index], aFactor) *
calc->mPercent +
NSAppUnitsToFloatPixels(calc->mLength, aFactor);
} else if (coord.GetUnit() == eStyleUnit_Percent) {
*coords[index] = NSAppUnitsToFloatPixels(*dimensions[index], aFactor) *
coord.GetPercentValue();
} else {
NS_ABORT_IF_FALSE(coord.GetUnit() == eStyleUnit_Coord, "unexpected unit");
*coords[index] = NSAppUnitsToFloatPixels(coord.GetCoordValue(), aFactor);
}
}
/**
* An offset of (0,0) results in the perspective-origin being at the centre of the element,
* so include a shift of the centre point to (0,0).
*/
result.x -= NSAppUnitsToFloatPixels(boundingRect.width, aFactor)/2;
result.y -= NSAppUnitsToFloatPixels(boundingRect.height, aFactor)/2;
return result;
}
/* Wraps up the -moz-transform matrix in a change-of-basis matrix pair that
* translates from local coordinate space to transform coordinate space, then
* hands it back.
@ -2366,9 +2425,11 @@ nsDisplayTransform::GetResultingTransformMatrix(const nsIFrame* aFrame,
/* Account for the -moz-transform-origin property by translating the
* coordinate space to the new origin.
*/
gfxPoint toMozOrigin = GetDeltaToMozTransformOrigin(aFrame, aFactor, aBoundsOverride);
gfxPoint newOrigin = gfxPoint(NSAppUnitsToFloatPixels(aOrigin.x, aFactor),
NSAppUnitsToFloatPixels(aOrigin.y, aFactor));
gfxPoint3D toMozOrigin = GetDeltaToMozTransformOrigin(aFrame, aFactor, aBoundsOverride);
gfxPoint3D toPerspectiveOrigin = GetDeltaToMozPerspectiveOrigin(aFrame, aFactor, aBoundsOverride);
gfxPoint3D newOrigin = gfxPoint3D(NSAppUnitsToFloatPixels(aOrigin.x, aFactor),
NSAppUnitsToFloatPixels(aOrigin.y, aFactor),
0.0f);
/* Get the underlying transform matrix. This requires us to get the
* bounds of the frame.
@ -2379,24 +2440,39 @@ nsDisplayTransform::GetResultingTransformMatrix(const nsIFrame* aFrame,
/* Get the matrix, then change its basis to factor in the origin. */
PRBool dummy;
gfx3DMatrix result =
nsStyleTransformMatrix::ReadTransforms(disp->mSpecifiedTransform,
aFrame->GetStyleContext(),
aFrame->PresContext(),
dummy, bounds, aFactor);
const nsStyleDisplay* parentDisp = nsnull;
if (aFrame->GetParent()) {
parentDisp = aFrame->GetParent()->GetStyleDisplay();
}
if (nsLayoutUtils::Are3DTransformsEnabled() &&
parentDisp && parentDisp->mChildPerspective.GetUnit() == eStyleUnit_Coord &&
parentDisp->mChildPerspective.GetCoordValue() > 0.0) {
gfx3DMatrix perspective;
perspective._34 =
-1.0 / NSAppUnitsToFloatPixels(parentDisp->mChildPerspective.GetCoordValue(),
aFactor);
result = result * nsLayoutUtils::ChangeMatrixBasis(toPerspectiveOrigin, perspective);
}
return nsLayoutUtils::ChangeMatrixBasis
(newOrigin + toMozOrigin,
nsStyleTransformMatrix::ReadTransforms(disp->mSpecifiedTransform,
aFrame->GetStyleContext(),
aFrame->PresContext(),
dummy, bounds, aFactor));
}
const gfx3DMatrix&
nsDisplayTransform::GetTransform(float aFactor)
{
if (mTransform.IsIdentity() || mCachedFactor != aFactor) {
mTransform =
GetResultingTransformMatrix(mFrame, ToReferenceFrame(),
aFactor,
nsnull);
mCachedFactor = aFactor;
}
(newOrigin + toMozOrigin, result);
}
const gfx3DMatrix&
nsDisplayTransform::GetTransform(float aFactor)
{
if (mTransform.IsIdentity() || mCachedFactor != aFactor) {
mTransform =
GetResultingTransformMatrix(mFrame, ToReferenceFrame(),
aFactor,
nsnull);
mCachedFactor = aFactor;
}
return mTransform;
}
@ -2406,8 +2482,12 @@ already_AddRefed<Layer> nsDisplayTransform::BuildLayer(nsDisplayListBuilder *aBu
{
const gfx3DMatrix& newTransformMatrix =
GetTransform(mFrame->PresContext()->AppUnitsPerDevPixel());
if (newTransformMatrix.IsSingular())
if (newTransformMatrix.IsSingular() ||
(mFrame->GetStyleDisplay()->mBackfaceVisibility == NS_STYLE_BACKFACE_VISIBILITY_HIDDEN &&
newTransformMatrix.GetNormalVector().z <= 0.0)) {
return nsnull;
}
return aBuilder->LayerBuilder()->
BuildContainerLayerFor(aBuilder, aManager, mFrame, this, *mStoredList.GetList(),
@ -2419,6 +2499,8 @@ nsDisplayTransform::GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager) {
if (mFrame->AreLayersMarkedActive(nsChangeHint_UpdateTransformLayer))
return LAYER_ACTIVE;
if (!GetTransform(mFrame->PresContext()->AppUnitsPerDevPixel()).Is2D())
return LAYER_ACTIVE;
nsIFrame* activeScrolledRoot =
nsLayoutUtils::GetActiveScrolledRootFor(mFrame, nsnull);
return !mStoredList.ChildrenCanBeInactive(aBuilder,
@ -2473,20 +2555,24 @@ void nsDisplayTransform::HitTest(nsDisplayListBuilder *aBuilder,
float factor = nsPresContext::AppUnitsPerCSSPixel();
gfx3DMatrix matrix = GetTransform(factor);
if (matrix.IsSingular())
return;
/* If the matrix is singular, or a hidden backface is shown, we didn't hit anything. */
if (matrix.IsSingular() ||
(mFrame->GetStyleDisplay()->mBackfaceVisibility == NS_STYLE_BACKFACE_VISIBILITY_HIDDEN &&
matrix.GetNormalVector().z <= 0.0)) {
return;
}
/* We want to go from transformed-space to regular space.
* Thus we have to invert the matrix, which normally does
* the reverse operation (e.g. regular->transformed)
*/
matrix.Invert();
/* Now, apply the transform and pass it down the channel. */
nsRect resultingRect;
if (aRect.width == 1 && aRect.height == 1) {
gfxPoint point = matrix.Transform(gfxPoint(NSAppUnitsToFloatPixels(aRect.x, factor),
NSAppUnitsToFloatPixels(aRect.y, factor)));
gfxPoint point = matrix.Inverse().ProjectPoint(
gfxPoint(NSAppUnitsToFloatPixels(aRect.x, factor),
NSAppUnitsToFloatPixels(aRect.y, factor)));
resultingRect = nsRect(NSFloatPixelsToAppUnits(float(point.x), factor),
NSFloatPixelsToAppUnits(float(point.y), factor),
@ -2498,7 +2584,7 @@ void nsDisplayTransform::HitTest(nsDisplayListBuilder *aBuilder,
NSAppUnitsToFloatPixels(aRect.width, factor),
NSAppUnitsToFloatPixels(aRect.height, factor));
gfxRect rect = matrix.TransformBounds(originalRect);
gfxRect rect = matrix.Inverse().ProjectRectBounds(originalRect);;
resultingRect = nsRect(NSFloatPixelsToAppUnits(float(rect.X()), factor),
NSFloatPixelsToAppUnits(float(rect.Y()), factor),
@ -2691,14 +2777,21 @@ PRBool nsDisplayTransform::UntransformRect(const nsRect &aUntransformedBounds,
*/
float factor = nsPresContext::AppUnitsPerCSSPixel();
gfx3DMatrix matrix = GetResultingTransformMatrix(aFrame, aOrigin, factor, nsnull);
if (matrix.IsSingular() || !matrix.Is2D())
if (matrix.IsSingular())
return PR_FALSE;
/* We want to untransform the matrix, so invert the transformation first! */
matrix.Invert();
gfxRect result(NSAppUnitsToFloatPixels(aUntransformedBounds.x, factor),
NSAppUnitsToFloatPixels(aUntransformedBounds.y, factor),
NSAppUnitsToFloatPixels(aUntransformedBounds.width, factor),
NSAppUnitsToFloatPixels(aUntransformedBounds.height, factor));
*aOutRect = nsLayoutUtils::MatrixTransformRect(aUntransformedBounds, matrix,
factor);
/* We want to untransform the matrix, so invert the transformation first! */
result = matrix.Inverse().ProjectRectBounds(result);
*aOutRect = nsRect(NSFloatPixelsToAppUnits(float(result.x), factor),
NSFloatPixelsToAppUnits(float(result.y), factor),
NSFloatPixelsToAppUnits(float(result.width), factor),
NSFloatPixelsToAppUnits(float(result.height), factor));
return PR_TRUE;
}

128
layout/base/nsLayoutUtils.cpp
View File

@ -77,6 +77,7 @@
#include "nsIDocShellTreeItem.h"
#include "nsIWidget.h"
#include "gfxMatrix.h"
#include "gfxPoint3D.h"
#include "gfxTypes.h"
#include "gfxUserFontSet.h"
#include "nsTArray.h"
@ -107,6 +108,8 @@
#include "nsSVGForeignObjectFrame.h"
#include "nsSVGOuterSVGFrame.h"
#include "mozilla/Preferences.h"
#ifdef MOZ_XUL
#include "nsXULPopupManager.h"
#endif
@ -139,6 +142,22 @@ static ContentMap& GetContentMap() {
return *sContentMap;
}
PRBool
nsLayoutUtils::Are3DTransformsEnabled()
{
static PRBool s3DTransformsEnabled;
static PRBool s3DTransformPrefCached = PR_FALSE;
if (!s3DTransformPrefCached) {
s3DTransformPrefCached = PR_TRUE;
mozilla::Preferences::AddBoolVarCache(&s3DTransformsEnabled,
"layout.3d-transforms.enabled");
}
return s3DTransformsEnabled;
}
static void DestroyViewID(void* aObject, nsIAtom* aPropertyName,
void* aPropertyValue, void* aData)
{
@ -983,16 +1002,14 @@ nsLayoutUtils::GetPopupFrameForEventCoordinates(nsPresContext* aPresContext,
}
gfx3DMatrix
nsLayoutUtils::ChangeMatrixBasis(const gfxPoint &aOrigin,
nsLayoutUtils::ChangeMatrixBasis(const gfxPoint3D &aOrigin,
const gfx3DMatrix &aMatrix)
{
/* These are translation matrices from world-to-origin of relative frame and
* vice-versa. Although I could use the gfxMatrix::Translate function to
* accomplish this, I'm hoping to reduce the overall number of matrix
* operations by hardcoding as many of the matrices as possible.
* vice-versa.
*/
gfx3DMatrix worldToOrigin = gfx3DMatrix::From2D(gfxMatrix(1.0, 0.0, 0.0, 1.0, -aOrigin.x, -aOrigin.y));
gfx3DMatrix originToWorld = gfx3DMatrix::From2D(gfxMatrix(1.0, 0.0, 0.0, 1.0, aOrigin.x, aOrigin.y));
gfx3DMatrix worldToOrigin = gfx3DMatrix::Translation(-aOrigin);
gfx3DMatrix originToWorld = gfx3DMatrix::Translation(aOrigin);
/* Multiply all three to get the transform! */
return worldToOrigin * aMatrix * originToWorld;
@ -1093,43 +1110,81 @@ nsLayoutUtils::MatrixTransformPoint(const nsPoint &aPoint,
NSFloatPixelsToAppUnits(float(image.y), aFactor));
}
gfx3DMatrix nsLayoutUtils::GetTransformToAncestor(nsIFrame *aFrame,
nsIFrame* aStopAtAncestor)
{
gfx3DMatrix ctm;
/* Starting at the specified frame, we'll use the GetTransformMatrix
* function of the frame, which gives us a matrix from this frame up
* to some other ancestor frame. If aStopAtAncestor frame is not reached,
* we stop at root. We get the CTM by simply accumulating all of these
* matrices together.
*/
while (aFrame && aFrame != aStopAtAncestor) {
ctm *= aFrame->GetTransformMatrix(&aFrame);
}
NS_ASSERTION(aFrame == aStopAtAncestor, "How did we manage to miss the ancestor?");
return ctm;
}
nsPoint
nsLayoutUtils::InvertTransformsToRoot(nsIFrame *aFrame,
const nsPoint &aPoint)
static gfxPoint
InvertTransformsToAncestor(nsIFrame *aFrame,
const gfxPoint &aPoint,
nsIFrame *aStopAtAncestor = nsnull)
{
NS_PRECONDITION(aFrame, "Why are you inverting transforms when there is no frame?");
/* To invert everything to the root, we'll get the CTM, invert it, and use it to transform
* the point.
*/
gfx3DMatrix ctm = GetTransformToAncestor(aFrame);
nsIFrame *parent = nsnull;
gfx3DMatrix ctm = aFrame->GetTransformMatrix(&parent);
gfxPoint result = aPoint;
if (parent && parent != aStopAtAncestor) {
result = InvertTransformsToAncestor(parent, aPoint, aStopAtAncestor);
}
/* If the ctm is singular, hand back (0, 0) as a sentinel. */
if (ctm.IsSingular())
return nsPoint(0, 0);
result = ctm.Inverse().ProjectPoint(result);
return result;
}
/* TODO: Correctly handle 3d transforms when they start being used */
static gfxRect
InvertGfxRectToAncestor(nsIFrame *aFrame,
const gfxRect &aRect,
nsIFrame *aStopAtAncestor = nsnull)
{
NS_PRECONDITION(aFrame, "Why are you inverting transforms when there is no frame?");
/* Otherwise, invert the CTM and use it to transform the point. */
return MatrixTransformPoint(aPoint, ctm.Invert(), aFrame->PresContext()->AppUnitsPerDevPixel());
/* To invert everything to the root, we'll get the CTM, invert it, and use it to transform
* the point.
*/
nsIFrame *parent = nsnull;
gfx3DMatrix ctm = aFrame->GetTransformMatrix(&parent);
gfxRect result = aRect;
if (parent && parent != aStopAtAncestor) {
result = InvertGfxRectToAncestor(parent, aRect, aStopAtAncestor);
}
result = ctm.Inverse().ProjectRectBounds(result);
return result;
}
nsPoint
nsLayoutUtils::InvertTransformsToRoot(nsIFrame *aFrame,
const nsPoint &aPoint)
{
float factor = aFrame->PresContext()->AppUnitsPerDevPixel();
gfxPoint result(NSAppUnitsToFloatPixels(aPoint.x, factor),
NSAppUnitsToFloatPixels(aPoint.y, factor));
result = InvertTransformsToAncestor(aFrame, result);
return nsPoint(NSFloatPixelsToAppUnits(float(result.x), factor),
NSFloatPixelsToAppUnits(float(result.y), factor));
}
nsRect
nsLayoutUtils::TransformRectToBoundsInAncestor(nsIFrame* aFrame,
const nsRect &aRect,
nsIFrame* aStopAtAncestor)
{
float factor = aFrame->PresContext()->AppUnitsPerDevPixel();
gfxRect result(NSAppUnitsToFloatPixels(aRect.x, factor),
NSAppUnitsToFloatPixels(aRect.y, factor),
NSAppUnitsToFloatPixels(aRect.width, factor),
NSAppUnitsToFloatPixels(aRect.height, factor));
result = InvertGfxRectToAncestor(aFrame, result, aStopAtAncestor);
return nsRect(NSFloatPixelsToAppUnits(float(result.x), factor),
NSFloatPixelsToAppUnits(float(result.y), factor),
NSFloatPixelsToAppUnits(float(result.width), factor),
NSFloatPixelsToAppUnits(float(result.height), factor));
}
static nsIntPoint GetWidgetOffset(nsIWidget* aWidget, nsIWidget*& aRootWidget) {
@ -3160,11 +3215,6 @@ GraphicsFilter
nsLayoutUtils::GetGraphicsFilterForFrame(nsIFrame* aForFrame)
{
GraphicsFilter defaultFilter = gfxPattern::FILTER_GOOD;
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
if (!mozilla::supports_neon()) {
defaultFilter = gfxPattern::FILTER_NEAREST;
}
#endif
nsIFrame *frame = nsCSSRendering::IsCanvasFrame(aForFrame) ?
nsCSSRendering::FindBackgroundStyleFrame(aForFrame) : aForFrame;

24
layout/base/nsLayoutUtils.h
View File

@ -461,7 +461,7 @@ public:
* @return A matrix equivalent to aMatrix, but operating in the coordinate system with
* origin aOrigin.
*/
static gfx3DMatrix ChangeMatrixBasis(const gfxPoint &aOrigin, const gfx3DMatrix &aMatrix);
static gfx3DMatrix ChangeMatrixBasis(const gfxPoint3D &aOrigin, const gfx3DMatrix &aMatrix);
/**
* Find IDs corresponding to a scrollable content element in the child process.
@ -510,17 +510,11 @@ public:
PRBool aShouldIgnoreSuppression = PR_FALSE,
PRBool aIgnoreRootScrollFrame = PR_FALSE);
/**
* Returns the CTM at the specified frame. This matrix can be used to map
* coordinates from aFrame's to aStopAtAncestor's coordinate system.
*
* @param aFrame The frame at which we should calculate the CTM.
* @param aStopAtAncestor is an ancestor frame to stop at. If it's nsnull,
* matrix accumulating stops at root.
* @return The CTM at the specified frame.
*/
static gfx3DMatrix GetTransformToAncestor(nsIFrame *aFrame,
nsIFrame* aStopAtAncestor = nsnull);
static nsRect TransformRectToBoundsInAncestor(nsIFrame* aFrame,
const nsRect& aRect,
nsIFrame* aStopAtAncestor);
/**
* Given a point in the global coordinate space, returns that point expressed
@ -534,7 +528,6 @@ public:
static nsPoint InvertTransformsToRoot(nsIFrame* aFrame,
const nsPoint &aPt);
/**
* Helper function that, given a rectangle and a matrix, returns the smallest
* rectangle containing the image of the source rectangle.
@ -1388,6 +1381,11 @@ public:
PRBool aFollowContinuations,
nsFontFaceList* aFontFaceList);
/**
* Checks if CSS 3D transforms are currently enabled.
*/
static PRBool Are3DTransformsEnabled();
static void Shutdown();
#ifdef DEBUG

4
layout/base/nsStyleConsts.h
View File

@ -858,6 +858,10 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_COLOR_INTERPOLATION_SRGB 1
#define NS_STYLE_COLOR_INTERPOLATION_LINEARRGB 2
// 3d Transforms - Backface visibility
#define NS_STYLE_BACKFACE_VISIBILITY_VISIBLE 1
#define NS_STYLE_BACKFACE_VISIBILITY_HIDDEN 0
/*****************************************************************************
* Constants for media features. *
*****************************************************************************/

2
layout/generic/nsFrame.cpp
View File

@ -4214,7 +4214,7 @@ nsIFrame::GetTransformMatrix(nsIFrame **aOutAncestor)
nsDisplayTransform::GetResultingTransformMatrix(this, nsPoint(0, 0),
scaleFactor);
/* Combine the raw transform with a translation to our parent. */
result = result * gfx3DMatrix::Translation
result *= gfx3DMatrix::Translation
(NSAppUnitsToFloatPixels(delta.x, scaleFactor),
NSAppUnitsToFloatPixels(delta.y, scaleFactor),
0.0f);

2
layout/reftests/backgrounds/reftest.list
View File

@ -99,7 +99,7 @@ fails-if(Android) == viewport-translucent-color-3.html viewport-translucent-colo
# the image aren't the issue, because they're being obscured to avoid sampling
# algorithm dependencies (at least assuming the sampling algorithm in use
# doesn't sample too far astray from the boundaries).
fails-if(!Android) == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
# background-size affects images without intrinsic dimensions specially; we may
# not support such image formats right now, but when we do, we want

10
layout/style/nsCSSKeywordList.h
View File

@ -333,6 +333,7 @@ CSS_KEY(ltr, ltr)
CSS_KEY(manual, manual)
CSS_KEY(margin-box, margin_box)
CSS_KEY(matrix, matrix)
CSS_KEY(matrix3d, matrix3d)
CSS_KEY(medium, medium)
CSS_KEY(menu, menu)
CSS_KEY(menutext, menutext)
@ -366,6 +367,7 @@ CSS_KEY(padding-box, padding_box)
CSS_KEY(painted, painted)
CSS_KEY(paused, paused)
CSS_KEY(pc, pc)
CSS_KEY(perspective, perspective)
CSS_KEY(physical, physical)
CSS_KEY(pointer, pointer)
CSS_KEY(portrait, portrait)
@ -387,6 +389,10 @@ CSS_KEY(reverse, reverse)
CSS_KEY(ridge, ridge)
CSS_KEY(right, right)
CSS_KEY(rotate, rotate)
CSS_KEY(rotate3d, rotate3d)
CSS_KEY(rotatex, rotatex)
CSS_KEY(rotatey, rotatey)
CSS_KEY(rotatez, rotatez)
CSS_KEY(round, round)
CSS_KEY(row-resize, row_resize)
CSS_KEY(rtl, rtl)
@ -394,8 +400,10 @@ CSS_KEY(running, running)
CSS_KEY(s, s)
CSS_KEY(s-resize, s_resize)
CSS_KEY(scale, scale)
CSS_KEY(scale3d, scale3d)
CSS_KEY(scalex, scalex)
CSS_KEY(scaley, scaley)
CSS_KEY(scalez, scalez)
CSS_KEY(scroll, scroll)
CSS_KEY(scrollbar, scrollbar)
CSS_KEY(scrollbar-small, scrollbar_small)
@ -453,8 +461,10 @@ CSS_KEY(toggle, toggle)
CSS_KEY(top, top)
CSS_KEY(top-outside, top_outside)
CSS_KEY(translate, translate)
CSS_KEY(translate3d, translate3d)
CSS_KEY(translatex, translatex)
CSS_KEY(translatey, translatey)
CSS_KEY(translatez, translatez)
CSS_KEY(transparent, transparent) // for nsComputedDOMStyle only
CSS_KEY(tri-state, tri_state)
CSS_KEY(ultra-condensed, ultra_condensed)

139
layout/style/nsCSSParser.cpp
View File

@ -87,6 +87,7 @@
#include "prlog.h"
#include "CSSCalc.h"
#include "nsMediaFeatures.h"
#include "nsLayoutUtils.h"
namespace css = mozilla::css;
@ -120,6 +121,7 @@ namespace css = mozilla::css;
#define VARIANT_ZERO_ANGLE 0x02000000 // unitless zero for angles
#define VARIANT_CALC 0x04000000 // eCSSUnit_Calc
#define VARIANT_ELEMENT 0x08000000 // eCSSUnit_Element
#define VARIANT_POSITIVE_LENGTH 0x10000000 // Only lengths greater than 0.0
// Common combinations of variants
#define VARIANT_AL (VARIANT_AUTO | VARIANT_LENGTH)
@ -585,7 +587,7 @@ protected:
}
/* Functions for -moz-transform Parsing */
PRBool ParseSingleTransform(nsCSSValue& aValue);
PRBool ParseSingleTransform(nsCSSValue& aValue, PRBool& aIs3D);
PRBool ParseFunction(const nsString &aFunction, const PRInt32 aAllowedTypes[],
PRUint16 aMinElems, PRUint16 aMaxElems,
nsCSSValue &aValue);
@ -594,9 +596,8 @@ protected:
PRUint16 aMaxElems,
nsTArray<nsCSSValue>& aOutput);
/* Functions for -moz-transform-origin Parsing */
PRBool ParseMozTransformOrigin();
/* Functions for -moz-transform-origin/-moz-perspective-origin Parsing */
PRBool ParseMozTransformOrigin(PRBool aPerspective);
/* Find and return the namespace ID associated with aPrefix.
If aPrefix has not been declared in an @namespace rule, returns
@ -4544,6 +4545,12 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
((aVariantMask & (VARIANT_LENGTH | VARIANT_ZERO_ANGLE)) != 0 &&
eCSSToken_Number == tk->mType &&
tk->mNumber == 0.0f)) {
if ((aVariantMask & VARIANT_POSITIVE_LENGTH) != 0 &&
eCSSToken_Number == tk->mType &&
tk->mNumber <= 0.0) {
UngetToken();
return PR_FALSE;
}
if (TranslateDimension(aValue, aVariantMask, tk->mNumber, tk->mIdent)) {
return PR_TRUE;
}
@ -5541,7 +5548,9 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
case eCSSProperty__moz_transform:
return ParseMozTransform();
case eCSSProperty__moz_transform_origin:
return ParseMozTransformOrigin();
return ParseMozTransformOrigin(PR_FALSE);
case eCSSProperty_perspective_origin:
return ParseMozTransformOrigin(PR_TRUE);
case eCSSProperty_transition:
return ParseTransition();
case eCSSProperty_animation:
@ -7263,38 +7272,56 @@ CSSParserImpl::ParseFunction(const nsString &aFunction,
static PRBool GetFunctionParseInformation(nsCSSKeyword aToken,
PRUint16 &aMinElems,
PRUint16 &aMaxElems,
const PRInt32 *& aVariantMask)
const PRInt32 *& aVariantMask,
PRBool &aIs3D)
{
/* These types represent the common variant masks that will be used to
* parse out the individual functions. The order in the enumeration
* must match the order in which the masks are declared.
*/
enum { eLengthPercentCalc,
eLengthCalc,
eTwoLengthPercentCalcs,
eTwoLengthPercentCalcsOneLengthCalc,
eAngle,
eTwoAngles,
eNumber,
ePositiveLength,
eTwoNumbers,
eThreeNumbers,
eThreeNumbersOneAngle,
eMatrix,
eMatrix3d,
eNumVariantMasks };
static const PRInt32 kMaxElemsPerFunction = 6;
static const PRInt32 kMaxElemsPerFunction = 16;
static const PRInt32 kVariantMasks[eNumVariantMasks][kMaxElemsPerFunction] = {
{VARIANT_TRANSFORM_LPCALC},
{VARIANT_LENGTH|VARIANT_CALC},
{VARIANT_TRANSFORM_LPCALC, VARIANT_TRANSFORM_LPCALC},
{VARIANT_TRANSFORM_LPCALC, VARIANT_TRANSFORM_LPCALC, VARIANT_LENGTH|VARIANT_CALC},
{VARIANT_ANGLE_OR_ZERO},
{VARIANT_ANGLE_OR_ZERO, VARIANT_ANGLE_OR_ZERO},
{VARIANT_NUMBER},
{VARIANT_LENGTH|VARIANT_POSITIVE_LENGTH},
{VARIANT_NUMBER, VARIANT_NUMBER},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_ANGLE_OR_ZERO},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER,
VARIANT_TRANSFORM_LPCALC, VARIANT_TRANSFORM_LPCALC}};
VARIANT_TRANSFORM_LPCALC, VARIANT_TRANSFORM_LPCALC},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER,
VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER,
VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER,
VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER}};
#ifdef DEBUG
static const PRUint8 kVariantMaskLengths[eNumVariantMasks] =
{1, 2, 1, 2, 1, 2, 6};
{1, 1, 2, 3, 1, 2, 1, 1, 2, 3, 4, 6, 16};
#endif
PRInt32 variantIndex = eNumVariantMasks;
aIs3D = PR_FALSE;
switch (aToken) {
case eCSSKeyword_translatex:
case eCSSKeyword_translatey:
@ -7303,24 +7330,52 @@ static PRBool GetFunctionParseInformation(nsCSSKeyword aToken,
aMinElems = 1U;
aMaxElems = 1U;
break;
case eCSSKeyword_scalex:
/* Exactly one scale factor. */
variantIndex = eNumber;
case eCSSKeyword_translatez:
/* Exactly one length */
variantIndex = eLengthCalc;
aMinElems = 1U;
aMaxElems = 1U;
aIs3D = PR_TRUE;
break;
case eCSSKeyword_translate3d:
/* Exactly two lengthds or percents and a number */
variantIndex = eTwoLengthPercentCalcsOneLengthCalc;
aMinElems = 3U;
aMaxElems = 3U;
aIs3D = PR_TRUE;
break;
case eCSSKeyword_scalez:
aIs3D = PR_TRUE;
case eCSSKeyword_scalex:
case eCSSKeyword_scaley:
/* Exactly one scale factor. */
variantIndex = eNumber;
aMinElems = 1U;
aMaxElems = 1U;
break;
case eCSSKeyword_scale3d:
/* Exactly three scale factors. */
variantIndex = eThreeNumbers;
aMinElems = 3U;
aMaxElems = 3U;
aIs3D = PR_TRUE;
break;
case eCSSKeyword_rotatex:
case eCSSKeyword_rotatey:
aIs3D = PR_TRUE;
case eCSSKeyword_rotate:
case eCSSKeyword_rotatez:
/* Exactly one angle. */
variantIndex = eAngle;
aMinElems = 1U;
aMaxElems = 1U;
break;
case eCSSKeyword_rotate3d:
variantIndex = eThreeNumbersOneAngle;
aMinElems = 4U;
aMaxElems = 4U;
aIs3D = PR_TRUE;
break;
case eCSSKeyword_translate:
/* One or two lengths or percents. */
variantIndex = eTwoLengthPercentCalcs;
@ -7356,7 +7411,21 @@ static PRBool GetFunctionParseInformation(nsCSSKeyword aToken,
variantIndex = eMatrix;
aMinElems = 6U;
aMaxElems = 6U;
break;
break;
case eCSSKeyword_matrix3d:
/* 16 matrix values, all numbers */
variantIndex = eMatrix3d;
aMinElems = 16U;
aMaxElems = 16U;
aIs3D = PR_TRUE;
break;
case eCSSKeyword_perspective:
/* Exactly one scale number. */
variantIndex = ePositiveLength;
aMinElems = 1U;
aMaxElems = 1U;
aIs3D = PR_TRUE;
break;
default:
/* Oh dear, we didn't match. Report an error. */
return PR_FALSE;
@ -7382,7 +7451,7 @@ static PRBool GetFunctionParseInformation(nsCSSKeyword aToken,
* error if something goes wrong.
*/
PRBool
CSSParserImpl::ParseSingleTransform(nsCSSValue& aValue)
CSSParserImpl::ParseSingleTransform(nsCSSValue& aValue, PRBool& aIs3D)
{
if (!GetToken(PR_TRUE))
return PR_FALSE;
@ -7394,8 +7463,10 @@ CSSParserImpl::ParseSingleTransform(nsCSSValue& aValue)
const PRInt32* variantMask;
PRUint16 minElems, maxElems;
if (!GetFunctionParseInformation(nsCSSKeywords::LookupKeyword(mToken.mIdent),
minElems, maxElems, variantMask))
nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(mToken.mIdent);
if (!GetFunctionParseInformation(keyword,
minElems, maxElems, variantMask, aIs3D))
return PR_FALSE;
return ParseFunction(mToken.mIdent, variantMask, minElems, maxElems, aValue);
@ -7415,7 +7486,11 @@ PRBool CSSParserImpl::ParseMozTransform()
} else {
nsCSSValueList* cur = value.SetListValue();
for (;;) {
if (!ParseSingleTransform(cur->mValue)) {
PRBool is3D;
if (!ParseSingleTransform(cur->mValue, is3D)) {
return PR_FALSE;
}
if (is3D && !nsLayoutUtils::Are3DTransformsEnabled()) {
return PR_FALSE;
}
if (CheckEndProperty()) {
@ -7429,12 +7504,20 @@ PRBool CSSParserImpl::ParseMozTransform()
return PR_TRUE;
}
PRBool CSSParserImpl::ParseMozTransformOrigin()
PRBool CSSParserImpl::ParseMozTransformOrigin(PRBool aPerspective)
{
nsCSSValuePair position;
if (!ParseBoxPositionValues(position, PR_TRUE) || !ExpectEndProperty())
if (!ParseBoxPositionValues(position, PR_TRUE))
return PR_FALSE;
nsCSSProperty prop = eCSSProperty__moz_transform_origin;
if (aPerspective) {
if (!ExpectEndProperty()) {
return PR_FALSE;
}
prop = eCSSProperty_perspective_origin;
}
// Unlike many other uses of pairs, this position should always be stored
// as a pair, even if the values are the same, so it always serializes as
// a pair, and to keep the computation code simple.
@ -7442,11 +7525,21 @@ PRBool CSSParserImpl::ParseMozTransformOrigin()
position.mXValue.GetUnit() == eCSSUnit_Initial) {
NS_ABORT_IF_FALSE(position.mXValue == position.mYValue,
"inherit/initial only half?");
AppendValue(eCSSProperty__moz_transform_origin, position.mXValue);
AppendValue(prop, position.mXValue);
} else {
nsCSSValue pair;
pair.SetPairValue(&position);
AppendValue(eCSSProperty__moz_transform_origin, pair);
nsCSSValue value;
if (aPerspective) {
value.SetPairValue(position.mXValue, position.mYValue);
} else {
nsCSSValue depth;
if (!ParseVariant(depth, VARIANT_LENGTH | VARIANT_CALC, nsnull) ||
!nsLayoutUtils::Are3DTransformsEnabled()) {
depth.Reset();
}
value.SetTripletValue(position.mXValue, position.mYValue, depth);
}
AppendValue(prop, value);
}
return PR_TRUE;
}

28
layout/style/nsCSSPropList.h
View File

@ -2258,6 +2258,34 @@ CSS_PROP_DISPLAY(
kBackgroundPositionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
CSS_PROP_DISPLAY(
-moz-perspective-origin,
perspective_origin,
CSS_PROP_DOMPROP_PREFIXED(PerspectiveOrigin),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_STORES_CALC,
0,
kBackgroundPositionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
CSS_PROP_DISPLAY(
-moz-perspective,
perspective,
CSS_PROP_DOMPROP_PREFIXED(Perspective),
CSS_PROPERTY_PARSE_VALUE,
VARIANT_NONE | VARIANT_INHERIT | VARIANT_LENGTH,
nsnull,
offsetof(nsStyleDisplay, mChildPerspective),
eStyleAnimType_Coord)
CSS_PROP_DISPLAY(
-moz-backface-visibility,
backface_visibility,
CSS_PROP_DOMPROP_PREFIXED(BackfaceVisibility),
CSS_PROPERTY_PARSE_VALUE,
VARIANT_HK,
kBackfaceVisibilityKTable,
offsetof(nsStyleDisplay, mBackfaceVisibility),
eStyleAnimType_None)
CSS_PROP_POSITION(
top,
top,

5
layout/style/nsCSSProps.cpp
View File

@ -581,6 +581,11 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_UNKNOWN,-1
};
const PRInt32 nsCSSProps::kBackfaceVisibilityKTable[] = {
eCSSKeyword_visible, NS_STYLE_BACKFACE_VISIBILITY_VISIBLE,
eCSSKeyword_hidden, NS_STYLE_BACKFACE_VISIBILITY_HIDDEN
};
const PRInt32 nsCSSProps::kBackgroundAttachmentKTable[] = {
eCSSKeyword_fixed, NS_STYLE_BG_ATTACHMENT_FIXED,
eCSSKeyword_scroll, NS_STYLE_BG_ATTACHMENT_SCROLL,

1
layout/style/nsCSSProps.h
View File

@ -333,6 +333,7 @@ public:
static const PRInt32 kAnimationTimingFunctionKTable[];
static const PRInt32 kAppearanceKTable[];
static const PRInt32 kAzimuthKTable[];
static const PRInt32 kBackfaceVisibilityKTable[];
static const PRInt32 kBackgroundAttachmentKTable[];
static const PRInt32 kBackgroundInlinePolicyKTable[];
static const PRInt32 kBackgroundOriginKTable[];

69
layout/style/nsCSSValue.cpp
View File

@ -163,6 +163,10 @@ nsCSSValue::nsCSSValue(const nsCSSValue& aCopy)
mValue.mPair = aCopy.mValue.mPair;
mValue.mPair->AddRef();
}
else if (eCSSUnit_Triplet == mUnit) {
mValue.mTriplet = aCopy.mValue.mTriplet;
mValue.mTriplet->AddRef();
}
else if (eCSSUnit_Rect == mUnit) {
mValue.mRect = aCopy.mValue.mRect;
mValue.mRect->AddRef();
@ -232,6 +236,9 @@ PRBool nsCSSValue::operator==(const nsCSSValue& aOther) const
else if (eCSSUnit_Pair == mUnit) {
return *mValue.mPair == *aOther.mValue.mPair;
}
else if (eCSSUnit_Triplet == mUnit) {
return *mValue.mTriplet == *aOther.mValue.mTriplet;
}
else if (eCSSUnit_Rect == mUnit) {
return *mValue.mRect == *aOther.mValue.mRect;
}
@ -312,6 +319,8 @@ void nsCSSValue::DoReset()
mValue.mGradient->Release();
} else if (eCSSUnit_Pair == mUnit) {
mValue.mPair->Release();
} else if (eCSSUnit_Triplet == mUnit) {
mValue.mTriplet->Release();
} else if (eCSSUnit_Rect == mUnit) {
mValue.mRect->Release();
} else if (eCSSUnit_List == mUnit) {
@ -441,6 +450,46 @@ void nsCSSValue::SetPairValue(const nsCSSValue& xValue,
mValue.mPair->AddRef();
}
void nsCSSValue::SetTripletValue(const nsCSSValueTriplet* aValue)
{
// triplet should not be used for null/inherit/initial values
// Only allow Null for the z component
NS_ABORT_IF_FALSE(aValue &&
aValue->mXValue.GetUnit() != eCSSUnit_Null &&
aValue->mYValue.GetUnit() != eCSSUnit_Null &&
aValue->mXValue.GetUnit() != eCSSUnit_Inherit &&
aValue->mYValue.GetUnit() != eCSSUnit_Inherit &&
aValue->mZValue.GetUnit() != eCSSUnit_Inherit &&
aValue->mXValue.GetUnit() != eCSSUnit_Initial &&
aValue->mYValue.GetUnit() != eCSSUnit_Initial &&
aValue->mZValue.GetUnit() != eCSSUnit_Initial,
"missing or inappropriate triplet value");
Reset();
mUnit = eCSSUnit_Triplet;
mValue.mTriplet = new nsCSSValueTriplet_heap(aValue->mXValue, aValue->mYValue, aValue->mZValue);
mValue.mTriplet->AddRef();
}
void nsCSSValue::SetTripletValue(const nsCSSValue& xValue,
const nsCSSValue& yValue,
const nsCSSValue& zValue)
{
// Only allow Null for the z component
NS_ABORT_IF_FALSE(xValue.GetUnit() != eCSSUnit_Null &&
yValue.GetUnit() != eCSSUnit_Null &&
xValue.GetUnit() != eCSSUnit_Inherit &&
yValue.GetUnit() != eCSSUnit_Inherit &&
zValue.GetUnit() != eCSSUnit_Inherit &&
xValue.GetUnit() != eCSSUnit_Initial &&
yValue.GetUnit() != eCSSUnit_Initial &&
zValue.GetUnit() != eCSSUnit_Initial,
"inappropriate triplet value");
Reset();
mUnit = eCSSUnit_Triplet;
mValue.mTriplet = new nsCSSValueTriplet_heap(xValue, yValue, zValue);
mValue.mTriplet->AddRef();
}
nsCSSRect& nsCSSValue::SetRectValue()
{
Reset();
@ -960,6 +1009,8 @@ nsCSSValue::AppendToString(nsCSSProperty aProperty, nsAString& aResult) const
aResult.AppendLiteral(")");
} else if (eCSSUnit_Pair == unit) {
GetPairValue().AppendToString(aProperty, aResult);
} else if (eCSSUnit_Triplet == unit) {
GetTripletValue().AppendToString(aProperty, aResult);
} else if (eCSSUnit_Rect == unit) {
GetRectValue().AppendToString(aProperty, aResult);
} else if (eCSSUnit_List == unit || eCSSUnit_ListDep == unit) {
@ -1011,6 +1062,7 @@ nsCSSValue::AppendToString(nsCSSProperty aProperty, nsAString& aResult) const
case eCSSUnit_Number: break;
case eCSSUnit_Gradient: break;
case eCSSUnit_Pair: break;
case eCSSUnit_Triplet: break;
case eCSSUnit_Rect: break;
case eCSSUnit_List: break;
case eCSSUnit_ListDep: break;
@ -1177,6 +1229,23 @@ nsCSSValuePair::AppendToString(nsCSSProperty aProperty,
}
}
// --- nsCSSValueTriple -----------------
void
nsCSSValueTriplet::AppendToString(nsCSSProperty aProperty,
nsAString& aResult) const
{
mXValue.AppendToString(aProperty, aResult);
if (mYValue.GetUnit() != eCSSUnit_Null) {
aResult.Append(PRUnichar(' '));
mYValue.AppendToString(aProperty, aResult);
if (mZValue.GetUnit() != eCSSUnit_Null) {
aResult.Append(PRUnichar(' '));
mZValue.AppendToString(aProperty, aResult);
}
}
}
// --- nsCSSValuePairList -----------------
nsCSSValuePairList::~nsCSSValuePairList()

115
layout/style/nsCSSValue.h
View File

@ -142,12 +142,13 @@ enum nsCSSUnit {
eCSSUnit_Gradient = 42, // (nsCSSValueGradient*) value
eCSSUnit_Pair = 50, // (nsCSSValuePair*) pair of values
eCSSUnit_Rect = 51, // (nsCSSRect*) rectangle (four values)
eCSSUnit_List = 52, // (nsCSSValueList*) list of values
eCSSUnit_ListDep = 53, // (nsCSSValueList*) same as List
eCSSUnit_Triplet = 51, // (nsCSSValueTriplet*) triplet of values
eCSSUnit_Rect = 52, // (nsCSSRect*) rectangle (four values)
eCSSUnit_List = 53, // (nsCSSValueList*) list of values
eCSSUnit_ListDep = 54, // (nsCSSValueList*) same as List
// but does not own the list
eCSSUnit_PairList = 54, // (nsCSSValuePairList*) list of value pairs
eCSSUnit_PairListDep = 55, // (nsCSSValuePairList*) same as PairList
eCSSUnit_PairList = 55, // (nsCSSValuePairList*) list of value pairs
eCSSUnit_PairListDep = 56, // (nsCSSValuePairList*) same as PairList
// but does not own the list
eCSSUnit_Integer = 70, // (int) simple value
@ -200,6 +201,8 @@ struct nsCSSValueList;
struct nsCSSValueList_heap;
struct nsCSSValuePairList;
struct nsCSSValuePairList_heap;
struct nsCSSValueTriplet;
struct nsCSSValueTriplet_heap;
class nsCSSValue {
public:
@ -370,6 +373,9 @@ public:
inline nsCSSValuePairList* GetPairListValue();
inline const nsCSSValuePairList* GetPairListValue() const;
inline nsCSSValueTriplet& GetTripletValue();
inline const nsCSSValueTriplet& GetTripletValue() const;
URL* GetURLStructValue() const
{
// Not allowing this for Image values, because if the caller takes
@ -417,6 +423,8 @@ public:
void SetPairValue(const nsCSSValue& xValue, const nsCSSValue& yValue);
void SetDependentListValue(nsCSSValueList* aList);
void SetDependentPairListValue(nsCSSValuePairList* aList);
void SetTripletValue(const nsCSSValueTriplet* aTriplet);
void SetTripletValue(const nsCSSValue& xValue, const nsCSSValue& yValue, const nsCSSValue& zValue);
void SetAutoValue();
void SetInheritValue();
void SetInitialValue();
@ -531,6 +539,7 @@ protected:
nsCSSValueGradient* mGradient;
nsCSSValuePair_heap* mPair;
nsCSSRect_heap* mRect;
nsCSSValueTriplet_heap* mTriplet;
nsCSSValueList_heap* mList;
nsCSSValueList* mListDependent;
nsCSSValuePairList_heap* mPairList;
@ -838,12 +847,88 @@ struct nsCSSValuePair {
// refcounted. It should not be necessary to use this class directly;
// it's an implementation detail of nsCSSValue.
struct nsCSSValuePair_heap : public nsCSSValuePair {
// forward constructor
nsCSSValuePair_heap(const nsCSSValue& aXValue, const nsCSSValue& aYValue)
: nsCSSValuePair(aXValue, aYValue)
{}
NS_INLINE_DECL_REFCOUNTING(nsCSSValuePair_heap)
};
struct nsCSSValueTriplet {
nsCSSValueTriplet()
{
MOZ_COUNT_CTOR(nsCSSValueTriplet);
}
nsCSSValueTriplet(nsCSSUnit aUnit)
: mXValue(aUnit), mYValue(aUnit), mZValue(aUnit)
{
MOZ_COUNT_CTOR(nsCSSValueTriplet);
}
nsCSSValueTriplet(const nsCSSValue& aXValue,
const nsCSSValue& aYValue,
const nsCSSValue& aZValue)
: mXValue(aXValue), mYValue(aYValue), mZValue(aZValue)
{
MOZ_COUNT_CTOR(nsCSSValueTriplet);
}
nsCSSValueTriplet(const nsCSSValueTriplet& aCopy)
: mXValue(aCopy.mXValue), mYValue(aCopy.mYValue), mZValue(aCopy.mZValue)
{
MOZ_COUNT_CTOR(nsCSSValueTriplet);
}
~nsCSSValueTriplet()
{
MOZ_COUNT_DTOR(nsCSSValueTriplet);
}
PRBool operator==(const nsCSSValueTriplet& aOther) const {
return mXValue == aOther.mXValue &&
mYValue == aOther.mYValue &&
mZValue == aOther.mZValue;
}
PRBool operator!=(const nsCSSValueTriplet& aOther) const {
return mXValue != aOther.mXValue ||
mYValue != aOther.mYValue ||
mZValue != aOther.mZValue;
}
void SetAllValuesTo(const nsCSSValue& aValue) {
mXValue = aValue;
mYValue = aValue;
mZValue = aValue;
}
void Reset() {
mXValue.Reset();
mYValue.Reset();
mZValue.Reset();
}
PRBool HasValue() const {
return mXValue.GetUnit() != eCSSUnit_Null ||
mYValue.GetUnit() != eCSSUnit_Null ||
mZValue.GetUnit() != eCSSUnit_Null;
}
void AppendToString(nsCSSProperty aProperty, nsAString& aResult) const;
nsCSSValue mXValue;
nsCSSValue mYValue;
nsCSSValue mZValue;
};
// nsCSSValueTriplet_heap differs from nsCSSValueTriplet only in being
// refcounted. It should not be necessary to use this class directly;
// it's an implementation detail of nsCSSValue.
struct nsCSSValueTriplet_heap : public nsCSSValueTriplet {
// forward constructor
nsCSSValuePair_heap(const nsCSSValue& aXValue, const nsCSSValue& aYValue)
: nsCSSValuePair(aXValue, aYValue)
nsCSSValueTriplet_heap(const nsCSSValue& aXValue, const nsCSSValue& aYValue, const nsCSSValue& aZValue)
: nsCSSValueTriplet(aXValue, aYValue, aZValue)
{}
NS_INLINE_DECL_REFCOUNTING(nsCSSValuePair_heap)
NS_INLINE_DECL_REFCOUNTING(nsCSSValueTriplet_heap)
};
// This has to be here so that the relationship between nsCSSValuePair
@ -862,6 +947,20 @@ nsCSSValue::GetPairValue() const
return *mValue.mPair;
}
inline nsCSSValueTriplet&
nsCSSValue::GetTripletValue()
{
NS_ABORT_IF_FALSE(mUnit == eCSSUnit_Triplet, "not a triplet value");
return *mValue.mTriplet;
}
inline const nsCSSValueTriplet&
nsCSSValue::GetTripletValue() const
{
NS_ABORT_IF_FALSE(mUnit == eCSSUnit_Triplet, "not a triplet value");
return *mValue.mTriplet;
}
// Maybe should be replaced with nsCSSValueList and nsCSSValue::Array?
struct nsCSSValuePairList {
nsCSSValuePairList() : mNext(nsnull) { MOZ_COUNT_CTOR(nsCSSValuePairList); }

63
layout/style/nsComputedDOMStyle.cpp
View File

@ -938,9 +938,69 @@ nsComputedDOMStyle::DoGetMozTransformOrigin()
&nsComputedDOMStyle::GetFrameBoundsHeightForTransform);
valueList->AppendCSSValue(height);
if (display->mTransformOrigin[2].GetUnit() != eStyleUnit_Coord ||
display->mTransformOrigin[2].GetCoordValue() != 0) {
nsROCSSPrimitiveValue* depth = GetROCSSPrimitiveValue();
SetValueToCoord(depth, display->mTransformOrigin[2], PR_FALSE,
nsnull);
valueList->AppendCSSValue(depth);
}
return valueList;
}
/* Convert the stored representation into a list of two values and then hand
* it back.
*/
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetMozPerspectiveOrigin()
{
/* We need to build up a list of two values. We'll call them
* width and height.
*/
/* Store things as a value list */
nsDOMCSSValueList* valueList = GetROCSSValueList(PR_FALSE);
/* Now, get the values. */
const nsStyleDisplay* display = GetStyleDisplay();
nsROCSSPrimitiveValue* width = GetROCSSPrimitiveValue();
SetValueToCoord(width, display->mPerspectiveOrigin[0], PR_FALSE,
&nsComputedDOMStyle::GetFrameBoundsWidthForTransform);
valueList->AppendCSSValue(width);
nsROCSSPrimitiveValue* height = GetROCSSPrimitiveValue();
SetValueToCoord(height, display->mPerspectiveOrigin[1], PR_FALSE,
&nsComputedDOMStyle::GetFrameBoundsHeightForTransform);
valueList->AppendCSSValue(height);
return valueList;
}
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetMozPerspective()
{
nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
if (GetStyleDisplay()->mChildPerspective.GetUnit() == eStyleUnit_Coord &&
GetStyleDisplay()->mChildPerspective.GetCoordValue() == 0.0) {
val->SetIdent(eCSSKeyword_none);
} else {
SetValueToCoord(val, GetStyleDisplay()->mChildPerspective, PR_FALSE);
}
return val;
}
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetMozBackfaceVisibility()
{
nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
val->SetIdent(
nsCSSProps::ValueToKeywordEnum(GetStyleDisplay()->mBackfaceVisibility,
nsCSSProps::kBackfaceVisibilityKTable));
return val;
}
/* If the property is "none", hand back "none" wrapped in a value.
* Otherwise, compute the aggregate transform matrix and hands it back in a
* "matrix" wrapper.
@ -4365,6 +4425,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(animation_play_state, AnimationPlayState),
COMPUTED_STYLE_MAP_ENTRY(animation_timing_function, AnimationTimingFunction),
COMPUTED_STYLE_MAP_ENTRY(appearance, Appearance),
COMPUTED_STYLE_MAP_ENTRY(backface_visibility, MozBackfaceVisibility),
COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
COMPUTED_STYLE_MAP_ENTRY(binding, Binding),
COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors, BorderBottomColors),
@ -4397,6 +4458,8 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_outline_radius_bottomRight,OutlineRadiusBottomRight),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_outline_radius_topLeft, OutlineRadiusTopLeft),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_outline_radius_topRight, OutlineRadiusTopRight),
COMPUTED_STYLE_MAP_ENTRY(perspective, MozPerspective),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(perspective_origin, MozPerspectiveOrigin),
COMPUTED_STYLE_MAP_ENTRY(stack_sizing, StackSizing),
COMPUTED_STYLE_MAP_ENTRY(_moz_tab_size, MozTabSize),
COMPUTED_STYLE_MAP_ENTRY(text_blink, MozTextBlink),

3
layout/style/nsComputedDOMStyle.h
View File

@ -347,6 +347,9 @@ private:
nsIDOMCSSValue* DoGetPageBreakBefore();
nsIDOMCSSValue* DoGetMozTransform();
nsIDOMCSSValue* DoGetMozTransformOrigin();
nsIDOMCSSValue* DoGetMozPerspective();
nsIDOMCSSValue* DoGetMozBackfaceVisibility();
nsIDOMCSSValue* DoGetMozPerspectiveOrigin();
nsIDOMCSSValue* DoGetOrient();
/* User interface properties */

70
layout/style/nsRuleNode.cpp
View File

@ -4470,20 +4470,72 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
const nsCSSValue* transformOriginValue =
aRuleData->ValueForTransformOrigin();
if (transformOriginValue->GetUnit() != eCSSUnit_Null) {
#ifdef DEBUG
PRBool result =
#endif
SetPairCoords(*transformOriginValue,
display->mTransformOrigin[0],
display->mTransformOrigin[1],
parentDisplay->mTransformOrigin[0],
parentDisplay->mTransformOrigin[1],
const nsCSSValue& valX =
transformOriginValue->GetUnit() == eCSSUnit_Triplet ?
transformOriginValue->GetTripletValue().mXValue : *transformOriginValue;
const nsCSSValue& valY =
transformOriginValue->GetUnit() == eCSSUnit_Triplet ?
transformOriginValue->GetTripletValue().mYValue : *transformOriginValue;
const nsCSSValue& valZ =
transformOriginValue->GetUnit() == eCSSUnit_Triplet ?
transformOriginValue->GetTripletValue().mZValue : *transformOriginValue;
mozilla::DebugOnly<PRBool> cX =
SetCoord(valX, display->mTransformOrigin[0],
parentDisplay->mTransformOrigin[0],
SETCOORD_LPH | SETCOORD_INITIAL_HALF |
SETCOORD_BOX_POSITION | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree);
mozilla::DebugOnly<PRBool> cY =
SetCoord(valY, display->mTransformOrigin[1],
parentDisplay->mTransformOrigin[1],
SETCOORD_LPH | SETCOORD_INITIAL_HALF |
SETCOORD_BOX_POSITION | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree);
if (valZ.GetUnit() == eCSSUnit_Null) {
// Null for the z component means a 0 translation, not
// unspecified, as we have already checked the triplet
// value for Null.
display->mTransformOrigin[2].SetCoordValue(0);
} else {
mozilla::DebugOnly<PRBool> cZ =
SetCoord(valZ, display->mTransformOrigin[2],
parentDisplay->mTransformOrigin[2],
SETCOORD_LH | SETCOORD_INITIAL_ZERO | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree);
NS_ABORT_IF_FALSE(cY == cZ, "changed one but not the other");
}
NS_ABORT_IF_FALSE(cX == cY, "changed one but not the other");
NS_ASSERTION(cX, "Malformed -moz-transform-origin parse!");
}
const nsCSSValue* perspectiveOriginValue =
aRuleData->ValueForPerspectiveOrigin();
if (perspectiveOriginValue->GetUnit() != eCSSUnit_Null) {
mozilla::DebugOnly<PRBool> result =
SetPairCoords(*perspectiveOriginValue,
display->mPerspectiveOrigin[0],
display->mPerspectiveOrigin[1],
parentDisplay->mPerspectiveOrigin[0],
parentDisplay->mPerspectiveOrigin[1],
SETCOORD_LPH | SETCOORD_INITIAL_HALF |
SETCOORD_BOX_POSITION | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree);
NS_ASSERTION(result, "Malformed -moz-transform-origin parse!");
NS_ASSERTION(result, "Malformed -moz-perspective-origin parse!");
}
SetCoord(*aRuleData->ValueForPerspective(),
display->mChildPerspective, parentDisplay->mChildPerspective,
SETCOORD_LAH | SETCOORD_INITIAL_ZERO | SETCOORD_NONE,
aContext, mPresContext, canStoreInRuleTree);
SetDiscrete(*aRuleData->ValueForBackfaceVisibility(),
display->mBackfaceVisibility, canStoreInRuleTree,
SETDSC_ENUMERATED, parentDisplay->mBackfaceVisibility,
NS_STYLE_BACKFACE_VISIBILITY_VISIBLE, 0, 0, 0, 0);
// orient: enum, inherit, initial
SetDiscrete(*aRuleData->ValueForOrient(),
display->mOrient, canStoreInRuleTree,

176
layout/style/nsStyleAnimation.cpp
View File

@ -417,6 +417,61 @@ nsStyleAnimation::ComputeDistance(nsCSSProperty aProperty,
aDistance = sqrt(squareDistance);
return PR_TRUE;
}
case eUnit_CSSValueTriplet: {
const nsCSSValueTriplet *triplet1 = aStartValue.GetCSSValueTripletValue();
const nsCSSValueTriplet *triplet2 = aEndValue.GetCSSValueTripletValue();
nsCSSUnit unit[3];
unit[0] = GetCommonUnit(aProperty, triplet1->mXValue.GetUnit(),
triplet2->mXValue.GetUnit());
unit[1] = GetCommonUnit(aProperty, triplet1->mYValue.GetUnit(),
triplet2->mYValue.GetUnit());
unit[2] = GetCommonUnit(aProperty, triplet1->mZValue.GetUnit(),
triplet2->mZValue.GetUnit());
if (unit[0] == eCSSUnit_Null || unit[1] == eCSSUnit_Null ||
unit[0] == eCSSUnit_URL) {
return PR_FALSE;
}
double squareDistance = 0.0;
static nsCSSValue nsCSSValueTriplet::* const pairValues[3] = {
&nsCSSValueTriplet::mXValue, &nsCSSValueTriplet::mYValue, &nsCSSValueTriplet::mZValue
};
for (PRUint32 i = 0; i < 3; ++i) {
nsCSSValue nsCSSValueTriplet::*member = pairValues[i];
double diffsquared;
switch (unit[i]) {
case eCSSUnit_Pixel: {
float diff = (triplet1->*member).GetFloatValue() -
(triplet2->*member).GetFloatValue();
diffsquared = diff * diff;
break;
}
case eCSSUnit_Percent: {
float diff = (triplet1->*member).GetPercentValue() -
(triplet2->*member).GetPercentValue();
diffsquared = diff * diff;
break;
}
case eCSSUnit_Calc: {
CalcValue v1 = ExtractCalcValue(triplet1->*member);
CalcValue v2 = ExtractCalcValue(triplet2->*member);
float difflen = v2.mLength - v1.mLength;
float diffpct = v2.mPercent - v1.mPercent;
diffsquared = difflen * difflen + diffpct * diffpct;
break;
}
case eCSSUnit_Null:
break;
default:
NS_ABORT_IF_FALSE(PR_FALSE, "unexpected unit");
return PR_FALSE;
}
squareDistance += diffsquared;
}
aDistance = sqrt(squareDistance);
return PR_TRUE;
}
case eUnit_CSSRect: {
const nsCSSRect *rect1 = aStartValue.GetCSSRectValue();
const nsCSSRect *rect2 = aEndValue.GetCSSRectValue();
@ -1491,6 +1546,66 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
eUnit_CSSValuePair);
return PR_TRUE;
}
case eUnit_CSSValueTriplet: {
nsCSSValueTriplet triplet1(*aValue1.GetCSSValueTripletValue());
nsCSSValueTriplet triplet2(*aValue2.GetCSSValueTripletValue());
if (triplet1.mZValue.GetUnit() == eCSSUnit_Null) {
triplet1.mZValue.SetFloatValue(0.0, eCSSUnit_Pixel);
}
if (triplet2.mZValue.GetUnit() == eCSSUnit_Null) {
triplet2.mZValue.SetFloatValue(0.0, eCSSUnit_Pixel);
}
nsCSSUnit unit[3];
unit[0] = GetCommonUnit(aProperty, triplet1.mXValue.GetUnit(),
triplet2.mXValue.GetUnit());
unit[1] = GetCommonUnit(aProperty, triplet1.mYValue.GetUnit(),
triplet2.mYValue.GetUnit());
unit[2] = GetCommonUnit(aProperty, triplet1.mZValue.GetUnit(),
triplet2.mZValue.GetUnit());
if (unit[0] == eCSSUnit_Null || unit[1] == eCSSUnit_Null ||
unit[0] == eCSSUnit_Null || unit[0] == eCSSUnit_URL) {
return PR_FALSE;
}
nsAutoPtr<nsCSSValueTriplet> result(new nsCSSValueTriplet);
static nsCSSValue nsCSSValueTriplet::* const tripletValues[3] = {
&nsCSSValueTriplet::mXValue, &nsCSSValueTriplet::mYValue, &nsCSSValueTriplet::mZValue
};
PRUint32 restrictions = nsCSSProps::ValueRestrictions(aProperty);
for (PRUint32 i = 0; i < 3; ++i) {
nsCSSValue nsCSSValueTriplet::*member = tripletValues[i];
switch (unit[i]) {
case eCSSUnit_Pixel:
AddCSSValuePixel(aCoeff1, &triplet1->*member, aCoeff2, &triplet2->*member,
result->*member, restrictions);
break;
case eCSSUnit_Percent:
AddCSSValuePercent(aCoeff1, &triplet1->*member,
aCoeff2, &triplet2->*member,
result->*member, restrictions);
break;
case eCSSUnit_Calc:
AddCSSValueCanonicalCalc(aCoeff1, &triplet1->*member,
aCoeff2, &triplet2->*member,
result->*member);
break;
default:
NS_ABORT_IF_FALSE(PR_FALSE, "unexpected unit");
return PR_FALSE;
}
}
if (result->mZValue.GetUnit() == eCSSUnit_Pixel &&
result->mZValue.GetFloatValue() == 0.0f) {
result->mZValue.Reset();
}
aResultValue.SetAndAdoptCSSValueTripletValue(result.forget(),
eUnit_CSSValueTriplet);
return PR_TRUE;
}
case eUnit_CSSRect: {
NS_ABORT_IF_FALSE(nsCSSProps::ValueRestrictions(aProperty) == 0,
"must add code for handling value restrictions");
@ -1958,6 +2073,18 @@ nsStyleAnimation::UncomputeValue(nsCSSProperty aProperty,
aSpecifiedValue.SetPairValue(pair);
}
} break;
case eUnit_CSSValueTriplet: {
// Rule node processing expects triplet values to be collapsed to a
// single value if both halves would be equal, for most but not
// all properties. At present, all animatable properties that
// use pairs do expect collapsing.
const nsCSSValueTriplet* triplet = aComputedValue.GetCSSValueTripletValue();
if (triplet->mXValue == triplet->mYValue && triplet->mYValue == triplet->mZValue) {
aSpecifiedValue = triplet->mXValue;
} else {
aSpecifiedValue.SetTripletValue(triplet);
}
} break;
case eUnit_CSSRect: {
nsCSSRect& rect = aSpecifiedValue.SetRectValue();
rect = *aComputedValue.GetCSSRectValue();
@ -2266,13 +2393,35 @@ nsStyleAnimation::ExtractComputedValue(nsCSSProperty aProperty,
}
case eCSSProperty__moz_transform_origin: {
const nsStyleDisplay *styleDisplay =
static_cast<const nsStyleDisplay*>(styleStruct);
nsAutoPtr<nsCSSValueTriplet> triplet(new nsCSSValueTriplet);
if (!triplet ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[0],
triplet->mXValue) ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[1],
triplet->mYValue) ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[2],
triplet->mZValue)) {
return PR_FALSE;
}
if (triplet->mZValue.GetUnit() == eCSSUnit_Pixel &&
triplet->mZValue.GetFloatValue() == 0.0f) {
triplet->mZValue.Reset();
}
aComputedValue.SetAndAdoptCSSValueTripletValue(triplet.forget(),
eUnit_CSSValueTriplet);
break;
}
case eCSSProperty_perspective_origin: {
const nsStyleDisplay *styleDisplay =
static_cast<const nsStyleDisplay*>(styleStruct);
nsAutoPtr<nsCSSValuePair> pair(new nsCSSValuePair);
if (!pair ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[0],
!StyleCoordToCSSValue(styleDisplay->mPerspectiveOrigin[0],
pair->mXValue) ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[1],
!StyleCoordToCSSValue(styleDisplay->mPerspectiveOrigin[1],
pair->mYValue)) {
return PR_FALSE;
}
@ -2776,6 +2925,14 @@ nsStyleAnimation::Value::operator=(const Value& aOther)
mUnit = eUnit_Null;
}
break;
case eUnit_CSSValueTriplet:
NS_ABORT_IF_FALSE(aOther.mValue.mCSSValueTriplet,
"value triplets may not be null");
mValue.mCSSValueTriplet = new nsCSSValueTriplet(*aOther.mValue.mCSSValueTriplet);
if (!mValue.mCSSValueTriplet) {
mUnit = eUnit_Null;
}
break;
case eUnit_CSSRect:
NS_ABORT_IF_FALSE(aOther.mValue.mCSSRect, "rects may not be null");
mValue.mCSSRect = new nsCSSRect(*aOther.mValue.mCSSRect);
@ -2912,6 +3069,17 @@ nsStyleAnimation::Value::SetAndAdoptCSSValuePairValue(
mValue.mCSSValuePair = aValuePair; // take ownership
}
void
nsStyleAnimation::Value::SetAndAdoptCSSValueTripletValue(
nsCSSValueTriplet *aValueTriplet, Unit aUnit)
{
FreeValue();
NS_ABORT_IF_FALSE(IsCSSValueTripletUnit(aUnit), "bad unit");
NS_ABORT_IF_FALSE(aValueTriplet != nsnull, "value pairs may not be null");
mUnit = aUnit;
mValue.mCSSValueTriplet = aValueTriplet; // take ownership
}
void
nsStyleAnimation::Value::SetAndAdoptCSSRectValue(nsCSSRect *aRect, Unit aUnit)
{
@ -2953,6 +3121,8 @@ nsStyleAnimation::Value::FreeValue()
delete mValue.mCSSValueList;
} else if (IsCSSValuePairUnit(mUnit)) {
delete mValue.mCSSValuePair;
} else if (IsCSSValueTripletUnit(mUnit)) {
delete mValue.mCSSValueTriplet;
} else if (IsCSSRectUnit(mUnit)) {
delete mValue.mCSSRect;
} else if (IsCSSValuePairListUnit(mUnit)) {
@ -2991,6 +3161,8 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const
return *mValue.mCSSValue == *aOther.mValue.mCSSValue;
case eUnit_CSSValuePair:
return *mValue.mCSSValuePair == *aOther.mValue.mCSSValuePair;
case eUnit_CSSValueTriplet:
return *mValue.mCSSValueTriplet == *aOther.mValue.mCSSValueTriplet;
case eUnit_CSSRect:
return *mValue.mCSSRect == *aOther.mValue.mCSSRect;
case eUnit_Dasharray:

11
layout/style/nsStyleAnimation.h
View File

@ -55,6 +55,7 @@ class nsStyleContext;
class nsCSSValue;
struct nsCSSValueList;
struct nsCSSValuePair;
struct nsCSSValueTriplet;
struct nsCSSValuePairList;
struct nsCSSRect;
struct gfxMatrix;
@ -249,6 +250,7 @@ public:
eUnit_Calc, // nsCSSValue* (never null), always with a single
// calc() expression that's either length or length+percent
eUnit_CSSValuePair, // nsCSSValuePair* (never null)
eUnit_CSSValueTriplet, // nsCSSValueTriplet* (never null)
eUnit_CSSRect, // nsCSSRect* (never null)
eUnit_Dasharray, // nsCSSValueList* (never null)
eUnit_Shadow, // nsCSSValueList* (may be null)
@ -267,6 +269,7 @@ public:
nscolor mColor;
nsCSSValue* mCSSValue;
nsCSSValuePair* mCSSValuePair;
nsCSSValueTriplet* mCSSValueTriplet;
nsCSSRect* mCSSRect;
nsCSSValueList* mCSSValueList;
nsCSSValuePairList* mCSSValuePairList;
@ -312,6 +315,10 @@ public:
NS_ASSERTION(IsCSSValuePairUnit(mUnit), "unit mismatch");
return mValue.mCSSValuePair;
}
nsCSSValueTriplet* GetCSSValueTripletValue() const {
NS_ASSERTION(IsCSSValueTripletUnit(mUnit), "unit mismatch");
return mValue.mCSSValueTriplet;
}
nsCSSRect* GetCSSRectValue() const {
NS_ASSERTION(IsCSSRectUnit(mUnit), "unit mismatch");
return mValue.mCSSRect;
@ -369,6 +376,7 @@ public:
// "SetAndAdopt*".
void SetAndAdoptCSSValueValue(nsCSSValue *aValue, Unit aUnit);
void SetAndAdoptCSSValuePairValue(nsCSSValuePair *aValue, Unit aUnit);
void SetAndAdoptCSSValueTripletValue(nsCSSValueTriplet *aValue, Unit aUnit);
void SetAndAdoptCSSRectValue(nsCSSRect *aValue, Unit aUnit);
void SetAndAdoptCSSValueListValue(nsCSSValueList *aValue, Unit aUnit);
void SetAndAdoptCSSValuePairListValue(nsCSSValuePairList *aValue);
@ -396,6 +404,9 @@ public:
static PRBool IsCSSValuePairUnit(Unit aUnit) {
return aUnit == eUnit_CSSValuePair;
}
static PRBool IsCSSValueTripletUnit(Unit aUnit) {
return aUnit == eUnit_CSSValueTriplet;
}
static PRBool IsCSSRectUnit(Unit aUnit) {
return aUnit == eUnit_CSSRect;
}

28
layout/style/nsStyleStruct.cpp
View File

@ -2032,7 +2032,12 @@ nsStyleDisplay::nsStyleDisplay()
mOpacity = 1.0f;
mSpecifiedTransform = nsnull;
mTransformOrigin[0].SetPercentValue(0.5f); // Transform is centered on origin
mTransformOrigin[1].SetPercentValue(0.5f);
mTransformOrigin[1].SetPercentValue(0.5f);
mTransformOrigin[2].SetCoordValue(0);
mPerspectiveOrigin[0].SetPercentValue(0.5f);
mPerspectiveOrigin[1].SetPercentValue(0.5f);
mChildPerspective.SetCoordValue(0);
mBackfaceVisibility = NS_STYLE_BACKFACE_VISIBILITY_VISIBLE;
mOrient = NS_STYLE_ORIENT_HORIZONTAL;
mTransitions.AppendElement();
@ -2098,6 +2103,11 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
/* Copy over transform origin. */
mTransformOrigin[0] = aSource.mTransformOrigin[0];
mTransformOrigin[1] = aSource.mTransformOrigin[1];
mTransformOrigin[2] = aSource.mTransformOrigin[2];
mPerspectiveOrigin[0] = aSource.mPerspectiveOrigin[0];
mPerspectiveOrigin[1] = aSource.mPerspectiveOrigin[1];
mChildPerspective = aSource.mChildPerspective;
mBackfaceVisibility = aSource.mBackfaceVisibility;
}
nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
@ -2153,12 +2163,26 @@ nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame,
nsChangeHint_UpdateTransformLayer));
for (PRUint8 index = 0; index < 2; ++index)
for (PRUint8 index = 0; index < 3; ++index)
if (mTransformOrigin[index] != aOther.mTransformOrigin[index]) {
NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame,
nsChangeHint_RepaintFrame));
break;
}
for (PRUint8 index = 0; index < 2; ++index)
if (mPerspectiveOrigin[index] != aOther.mPerspectiveOrigin[index]) {
NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame,
nsChangeHint_RepaintFrame));
break;
}
if (mChildPerspective != aOther.mChildPerspective)
NS_UpdateHint(hint, NS_CombineHint(nsChangeHint_ReflowFrame,
nsChangeHint_RepaintFrame));
if (mBackfaceVisibility != aOther.mBackfaceVisibility)
NS_UpdateHint(hint, nsChangeHint_RepaintFrame);
}
// Note: Our current behavior for handling changes to the

5
layout/style/nsStyleStruct.h
View File

@ -1514,7 +1514,10 @@ struct nsStyleDisplay {
// initial are replaced by an actual list of transform functions, or
// null, as appropriate.) (owned by the style rule)
const nsCSSValueList *mSpecifiedTransform; // [reset]
nsStyleCoord mTransformOrigin[2]; // [reset] percent, coord, calc
nsStyleCoord mTransformOrigin[3]; // [reset] percent, coord, calc, 3rd param is coord, calc only
nsStyleCoord mChildPerspective; // [reset] coord
nsStyleCoord mPerspectiveOrigin[2]; // [reset] percent, coord, calc
PRUint8 mBackfaceVisibility;
nsAutoTArray<nsTransition, 1> mTransitions; // [reset]
// The number of elements in mTransitions that are not from repeating

248
layout/style/nsStyleTransformMatrix.cpp
View File

@ -172,6 +172,32 @@ nsStyleTransformMatrix::ProcessMatrix(const nsCSSValue::Array* aData,
return result;
}
/*static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessMatrix3D(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 17, "Invalid array!");
gfx3DMatrix temp;
temp._11 = aData->Item(1).GetFloatValue();
temp._12 = aData->Item(2).GetFloatValue();
temp._13 = aData->Item(3).GetFloatValue();
temp._14 = aData->Item(4).GetFloatValue();
temp._21 = aData->Item(5).GetFloatValue();
temp._22 = aData->Item(6).GetFloatValue();
temp._23 = aData->Item(7).GetFloatValue();
temp._24 = aData->Item(8).GetFloatValue();
temp._31 = aData->Item(9).GetFloatValue();
temp._32 = aData->Item(10).GetFloatValue();
temp._33 = aData->Item(11).GetFloatValue();
temp._34 = aData->Item(12).GetFloatValue();
temp._41 = aData->Item(13).GetFloatValue();
temp._42 = aData->Item(14).GetFloatValue();
temp._43 = aData->Item(15).GetFloatValue();
temp._44 = aData->Item(16).GetFloatValue();
return temp;
}
/* Helper function to process two matrices that we need to interpolate between */
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessInterpolateMatrix(const nsCSSValue::Array* aData,
@ -270,6 +296,23 @@ nsStyleTransformMatrix::ProcessTranslateY(const nsCSSValue::Array* aData,
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessTranslateZ(const nsCSSValue::Array* aData,
nsStyleContext* aContext,
nsPresContext* aPresContext,
PRBool& aCanStoreInRuleTree,
float aAppUnitsPerMatrixUnit)
{
NS_PRECONDITION(aData->Count() == 2, "Invalid array!");
gfx3DMatrix temp;
ProcessTranslatePart(temp._43, aData->Item(1),
aContext, aPresContext, aCanStoreInRuleTree,
0, aAppUnitsPerMatrixUnit);
return temp;
}
/* Helper function to process a translate function. */
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessTranslate(const nsCSSValue::Array* aData,
@ -282,14 +325,6 @@ nsStyleTransformMatrix::ProcessTranslate(const nsCSSValue::Array* aData,
gfx3DMatrix temp;
/* There are several cases to consider.
* First, we might have one value, or we might have two. If we have
* two, we need to consider both dX and dY components.
* Next, the values might be lengths, or they might be percents. If they're
* percents, store them in the dX and dY components. Otherwise, store them in
* the main matrix.
*/
ProcessTranslatePart(temp._41, aData->Item(1),
aContext, aPresContext, aCanStoreInRuleTree,
aBounds.Width(), aAppUnitsPerMatrixUnit);
@ -303,6 +338,32 @@ nsStyleTransformMatrix::ProcessTranslate(const nsCSSValue::Array* aData,
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessTranslate3D(const nsCSSValue::Array* aData,
nsStyleContext* aContext,
nsPresContext* aPresContext,
PRBool& aCanStoreInRuleTree,
nsRect& aBounds, float aAppUnitsPerMatrixUnit)
{
NS_PRECONDITION(aData->Count() == 4, "Invalid array!");
gfx3DMatrix temp;
ProcessTranslatePart(temp._41, aData->Item(1),
aContext, aPresContext, aCanStoreInRuleTree,
aBounds.Width(), aAppUnitsPerMatrixUnit);
ProcessTranslatePart(temp._42, aData->Item(2),
aContext, aPresContext, aCanStoreInRuleTree,
aBounds.Height(), aAppUnitsPerMatrixUnit);
ProcessTranslatePart(temp._43, aData->Item(3),
aContext, aPresContext, aCanStoreInRuleTree,
0, aAppUnitsPerMatrixUnit);
return temp;
}
/* Helper function to set up a scale matrix. */
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessScaleHelper(float aXScale, float aYScale, float aZScale)
@ -337,6 +398,22 @@ nsStyleTransformMatrix::ProcessScaleY(const nsCSSValue::Array* aData)
return ProcessScaleHelper(1.0f, aData->Item(1).GetFloatValue(), 1.0f);
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessScaleZ(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 2, "Bad array!");
return ProcessScaleHelper(1.0f, 1.0f, aData->Item(1).GetFloatValue());
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessScale3D(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 4, "Bad array!");
return ProcessScaleHelper(aData->Item(1).GetFloatValue(),
aData->Item(2).GetFloatValue(),
aData->Item(3).GetFloatValue());
}
/* Process a scale function. */
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessScale(const nsCSSValue::Array* aData)
@ -429,6 +506,135 @@ nsStyleTransformMatrix::ProcessRotateZ(const nsCSSValue::Array* aData)
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessRotateX(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 2, "Invalid array!");
/* We want our matrix to look like this:
* | 1 0 0 0 |
* | 0 cos(theta) sin(theta) 0 |
* | 0 -sin(theta) cos(theta) 0 |
* | 0 0 0 1 |
* (see http://www.w3.org/TR/SVG/coords.html#RotationDefined)
*/
double theta = aData->Item(1).GetAngleValueInRadians();
float cosTheta = FlushToZero(cos(theta));
float sinTheta = FlushToZero(sin(theta));
gfx3DMatrix temp;
temp._22 = cosTheta;
temp._23 = sinTheta;
temp._32 = -sinTheta;
temp._33 = cosTheta;
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessRotateY(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 2, "Invalid array!");
/* We want our matrix to look like this:
* | cos(theta) 0 -sin(theta) 0 |
* | 0 1 0 0 |
* | sin(theta) 0 cos(theta) 0 |
* | 0 0 0 1 |
* (see http://www.w3.org/TR/SVG/coords.html#RotationDefined)
*/
double theta = aData->Item(1).GetAngleValueInRadians();
float cosTheta = FlushToZero(cos(theta));
float sinTheta = FlushToZero(sin(theta));
gfx3DMatrix temp;
temp._11 = cosTheta;
temp._13 = -sinTheta;
temp._31 = sinTheta;
temp._33 = cosTheta;
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessRotate3D(const nsCSSValue::Array* aData)
{
NS_PRECONDITION(aData->Count() == 5, "Invalid array!");
/* We want our matrix to look like this:
* | 1 + (1-cos(angle))*(x*x-1) -z*sin(angle)+(1-cos(angle))*x*y y*sin(angle)+(1-cos(angle))*x*z 0 |
* | z*sin(angle)+(1-cos(angle))*x*y 1 + (1-cos(angle))*(y*y-1) -x*sin(angle)+(1-cos(angle))*y*z 0 |
* | -y*sin(angle)+(1-cos(angle))*x*z x*sin(angle)+(1-cos(angle))*y*z 1 + (1-cos(angle))*(z*z-1) 0 |
* | 0 0 0 1 |
* (see http://www.w3.org/TR/css3-3d-transforms/#transform-functions)
*/
double theta = aData->Item(4).GetAngleValueInRadians();
float cosTheta = FlushToZero(cos(theta));
float sinTheta = FlushToZero(sin(theta));
float x = aData->Item(1).GetFloatValue();
float y = aData->Item(2).GetFloatValue();
float z = aData->Item(3).GetFloatValue();
/* Normalize [x,y,z] */
float length = sqrt(x*x + y*y + z*z);
if (length == 0.0) {
return gfx3DMatrix();
}
x /= length;
y /= length;
z /= length;
gfx3DMatrix temp;
/* Create our matrix */
temp._11 = 1 + (1 - cosTheta) * (x * x - 1);
temp._12 = -z * sinTheta + (1 - cosTheta) * x * y;
temp._13 = y * sinTheta + (1 - cosTheta) * x * z;
temp._14 = 0.0f;
temp._21 = z * sinTheta + (1 - cosTheta) * x * y;
temp._22 = 1 + (1 - cosTheta) * (y * y - 1);
temp._23 = -x * sinTheta + (1 - cosTheta) * y * z;
temp._24 = 0.0f;
temp._31 = -y * sinTheta + (1 - cosTheta) * x * z;
temp._32 = x * sinTheta + (1 - cosTheta) * y * z;
temp._33 = 1 + (1 - cosTheta) * (z * z - 1);
temp._34 = 0.0f;
temp._41 = 0.0f;
temp._42 = 0.0f;
temp._43 = 0.0f;
temp._44 = 1.0f;
return temp;
}
/* static */ gfx3DMatrix
nsStyleTransformMatrix::ProcessPerspective(const nsCSSValue::Array* aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
float aAppUnitsPerMatrixUnit)
{
NS_PRECONDITION(aData->Count() == 2, "Invalid array!");
/* We want our matrix to look like this:
* | 1 0 0 0 |
* | 0 1 0 0 |
* | 0 0 1 -1/depth |
* | 0 0 0 1 |
*/
gfx3DMatrix temp;
float depth;
ProcessTranslatePart(depth, aData->Item(1), aContext,
aPresContext, aCanStoreInRuleTree,
0, aAppUnitsPerMatrixUnit);
NS_ASSERTION(depth > 0.0, "Perspective must be positive!");
temp._34 = -1.0/depth;
return temp;
}
/**
* Return the transform function, as an nsCSSKeyword, for the given
* nsCSSValue::Array from a transform list.
@ -467,29 +673,51 @@ nsStyleTransformMatrix::MatrixForTransformFunction(const nsCSSValue::Array * aDa
case eCSSKeyword_translatey:
return ProcessTranslateY(aData, aContext, aPresContext,
aCanStoreInRuleTree, aBounds, aAppUnitsPerMatrixUnit);
case eCSSKeyword_translatez:
return ProcessTranslateZ(aData, aContext, aPresContext,
aCanStoreInRuleTree, aAppUnitsPerMatrixUnit);
case eCSSKeyword_translate:
return ProcessTranslate(aData, aContext, aPresContext,
aCanStoreInRuleTree, aBounds, aAppUnitsPerMatrixUnit);
case eCSSKeyword_translate3d:
return ProcessTranslate3D(aData, aContext, aPresContext,
aCanStoreInRuleTree, aBounds, aAppUnitsPerMatrixUnit);
case eCSSKeyword_scalex:
return ProcessScaleX(aData);
case eCSSKeyword_scaley:
return ProcessScaleY(aData);
case eCSSKeyword_scalez:
return ProcessScaleZ(aData);
case eCSSKeyword_scale:
return ProcessScale(aData);
return ProcessScale(aData);
case eCSSKeyword_scale3d:
return ProcessScale3D(aData);
case eCSSKeyword_skewx:
return ProcessSkewX(aData);
case eCSSKeyword_skewy:
return ProcessSkewY(aData);
case eCSSKeyword_skew:
return ProcessSkew(aData);
case eCSSKeyword_rotatex:
return ProcessRotateX(aData);
case eCSSKeyword_rotatey:
return ProcessRotateY(aData);
case eCSSKeyword_rotatez:
case eCSSKeyword_rotate:
return ProcessRotateZ(aData);
return ProcessRotateZ(aData);
case eCSSKeyword_rotate3d:
return ProcessRotate3D(aData);
case eCSSKeyword_matrix:
return ProcessMatrix(aData, aContext, aPresContext,
aCanStoreInRuleTree, aBounds, aAppUnitsPerMatrixUnit);
case eCSSKeyword_matrix3d:
return ProcessMatrix3D(aData);
case eCSSKeyword_interpolatematrix:
return ProcessInterpolateMatrix(aData, aContext, aPresContext,
aCanStoreInRuleTree, aBounds, aAppUnitsPerMatrixUnit);
case eCSSKeyword_perspective:
return ProcessPerspective(aData, aContext, aPresContext,
aCanStoreInRuleTree, aAppUnitsPerMatrixUnit);
default:
NS_NOTREACHED("Unknown transform function!");
}

21
layout/style/nsStyleTransformMatrix.h
View File

@ -105,6 +105,7 @@ class nsStyleTransformMatrix
nsRect& aBounds, float aAppUnitsPerMatrixUnit,
PRBool *aPercentX = nsnull,
PRBool *aPercentY = nsnull);
static gfx3DMatrix ProcessMatrix3D(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessInterpolateMatrix(const nsCSSValue::Array *aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
@ -120,20 +121,40 @@ class nsStyleTransformMatrix
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
nsRect& aBounds, float aAppUnitsPerMatrixUnit);
static gfx3DMatrix ProcessTranslateZ(const nsCSSValue::Array *aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
float aAppUnitsPerMatrixUnit);
static gfx3DMatrix ProcessTranslate(const nsCSSValue::Array *aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
nsRect& aBounds, float aAppUnitsPerMatrixUnit);
static gfx3DMatrix ProcessTranslate3D(const nsCSSValue::Array *aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
nsRect& aBounds, float aAppUnitsPerMatrixUnit);
static gfx3DMatrix ProcessScaleHelper(float aXScale, float aYScale, float aZScale);
static gfx3DMatrix ProcessScaleX(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessScaleY(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessScaleZ(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessScale(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessScale3D(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessSkewHelper(double aXAngle, double aYAngle);
static gfx3DMatrix ProcessSkewX(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessSkewY(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessSkew(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessRotateX(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessRotateY(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessRotateZ(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessRotate3D(const nsCSSValue::Array *aData);
static gfx3DMatrix ProcessPerspective(const nsCSSValue::Array *aData,
nsStyleContext *aContext,
nsPresContext *aPresContext,
PRBool &aCanStoreInRuleTree,
float aAppUnitsPerMatrixUnit);
};
#endif

43
layout/style/test/property_database.js
View File

@ -967,6 +967,49 @@ var gCSSProperties = {
"border", "center red", "right diagonal",
"#00ffff bottom"]
},
"-moz-perspective-origin": {
domProp: "MozPerspectiveOrigin",
inherited: false,
type: CSS_TYPE_LONGHAND,
/* no subproperties */
prerequisites: { "width": "10px", "height": "10px", "display": "block"},
initial_values: [ "50% 50%", "center", "center center" ],
other_values: [ "25% 25%", "5px 5px", "20% 3em", "0 0", "0in 1in",
"top", "bottom","top left", "top right",
"top center", "center left", "center right",
"bottom left", "bottom right", "bottom center",
"20% center", "5px center", "13in bottom",
"left 50px", "right 13%", "center 40px",
"-moz-calc(20px)",
"-moz-calc(20px) 10px",
"10px -moz-calc(20px)",
"-moz-calc(20px) 25%",
"25% -moz-calc(20px)",
"-moz-calc(20px) -moz-calc(20px)",
"-moz-calc(20px + 1em) -moz-calc(20px / 2)",
"-moz-calc(20px + 50%) -moz-calc(50% - 10px)",
"-moz-calc(-20px) -moz-calc(-50%)",
"-moz-calc(-20%) -moz-calc(-50%)" ],
invalid_values: [ "red", "auto", "none", "0.5 0.5", "40px #0000ff",
"border", "center red", "right diagonal",
"#00ffff bottom"]
},
"-moz-perspective": {
domProp: "MozPerspective",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none", "0" ],
other_values: [ "1000px", "500.2px", "-100px", "-27.2em" ],
invalid_values: [ "pants", "200" ]
},
"-moz-backface-visibility": {
domProp: "MozBackfaceVisibility",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "visible" ],
other_values: [ "hidden" ],
invalid_values: [ "collapse" ]
},
"-moz-user-focus": {
domProp: "MozUserFocus",
inherited: true,

4
layout/style/test/test_transitions_per_property.html
View File

@ -81,6 +81,9 @@ var supported_properties = {
"-moz-transform-origin": [ test_length_pair_transition,
test_length_percent_pair_transition,
test_length_percent_pair_unclamped ],
"-moz-perspective-origin": [ test_length_pair_transition,
test_length_percent_pair_transition,
test_length_percent_pair_unclamped ],
"background-color": [ test_color_transition ],
"background-position": [ test_background_position_transition,
// FIXME: We don't currently test clamping,
@ -191,6 +194,7 @@ var supported_properties = {
"padding-top": [ test_length_transition, test_percent_transition,
test_length_percent_calc_transition,
test_length_clamped, test_percent_clamped ],
"-moz-perspective": [ test_length_transition ],
"right": [ test_length_transition, test_percent_transition,
test_length_percent_calc_transition,
test_length_unclamped, test_percent_unclamped ],

11
media/libsydneyaudio/src/sydney_audio_alsa.c
View File

@ -249,7 +249,6 @@ sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes) {
}
nframes = snd_pcm_bytes_to_frames(s->output_unit, nbytes);
while(nframes>0) {
if (s->resumed) {
avail = snd_pcm_avail_update(s->output_unit);
@ -257,7 +256,9 @@ sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes) {
avail = snd_pcm_avail_update(s->output_unit);
s->resumed = avail != 0;
} else {
frames = snd_pcm_writei(s->output_unit, data, nframes);
avail = snd_pcm_avail_update(s->output_unit);
avail = avail < 64 ? 64 : avail;
frames = snd_pcm_writei(s->output_unit, data, nframes > avail ? avail : nframes);
}
if (frames < 0) {
int r = snd_pcm_recover(s->output_unit, frames, 1);
@ -265,13 +266,13 @@ sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes) {
return SA_ERROR_SYSTEM;
}
} else {
size_t bytes = snd_pcm_frames_to_bytes(s->output_unit, frames);
nframes -= frames;
data = ((unsigned char *)data) + snd_pcm_frames_to_bytes(s->output_unit, frames);
data = ((unsigned char *)data) + bytes;
s->bytes_written += bytes;
}
}
s->bytes_written += nbytes;
return SA_SUCCESS;
}

10
mobile/app/mobile.js
View File

@ -651,3 +651,13 @@ pref("browser.firstrun.show.localepicker", true);
// initiated by a user
pref("content.ime.strict_policy", true);
// True if you always want dump() to work
//
// On Android, you also need to do the following for the output
// to show up in logcat:
//
// $ adb shell stop
// $ adb shell setprop log.redirect-stdio true
// $ adb shell start
pref("browser.dom.window.dump.enabled", false);

2
mobile/themes/core/jar.mn
View File

@ -131,7 +131,7 @@ chrome.jar:
skin/images/handle-end.png (images/handle-end.png)
chrome.jar:
% skin browser classic/1.0 %skin/gingerbread/ os=Android osversion=2.3 osversion=2.3.3 osversion=2.3.4
% skin browser classic/1.0 %skin/gingerbread/ os=Android osversion=2.3 osversion=2.3.3 osversion=2.3.4 osversion=2.3.5 osversion=2.3.6 osversion=2.3.7
% skin browser gingerbread/1.0 %skin/gingerbread/
skin/gingerbread/aboutPage.css (aboutPage.css)
skin/gingerbread/about.css (about.css)

6
modules/libpr0n/src/RasterImage.cpp
View File

@ -842,8 +842,7 @@ RasterImage::InternalAddFrame(PRUint32 framenum,
if (mFrames.Length() == 1) {
// Since we're about to add our second frame, initialize animation stuff
if (!ensureAnimExists())
return NS_ERROR_OUT_OF_MEMORY;
EnsureAnimExists();
// If we dispose of the first frame by clearing it, then the
// First Frame's refresh area is all of itself.
@ -1113,8 +1112,7 @@ RasterImage::StartAnimation()
NS_ABORT_IF_FALSE(ShouldAnimate(), "Should not animate!");
if (!ensureAnimExists())
return NS_ERROR_OUT_OF_MEMORY;
EnsureAnimExists();
NS_ABORT_IF_FALSE(mAnim && !mAnim->timer, "Anim must exist and not have a timer yet");

3
modules/libpr0n/src/RasterImage.h
View File

@ -382,7 +382,7 @@ private:
imgFrame* GetCurrentDrawableImgFrame();
PRUint32 GetCurrentImgFrameIndex() const;
inline Anim* ensureAnimExists()
inline void EnsureAnimExists()
{
if (!mAnim) {
@ -400,7 +400,6 @@ private:
// is acceptable for the moment.
LockImage();
}
return mAnim;
}
/** Function for doing the frame compositing of animations

3
modules/libpref/src/init/all.js
View File

@ -3325,3 +3325,6 @@ pref("network.buffer.cache.size", 32768);
// Desktop Notification
pref("notification.feature.enabled", false);
//3D Transforms
pref("layout.3d-transforms.enabled, false);

37
netwerk/cache/nsDeleteDir.cpp vendored
View File

@ -21,6 +21,7 @@
*
* Contributor(s):
* Darin Fisher <darin@meer.net>
* Jason Duell <jduell.mcbugs@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -41,6 +42,7 @@
#include "nsString.h"
#include "prthread.h"
#include "mozilla/Telemetry.h"
#include "nsITimer.h"
using namespace mozilla;
@ -52,7 +54,17 @@ static void DeleteDirThreadFunc(void *arg)
NS_RELEASE(dir);
}
nsresult DeleteDir(nsIFile *dirIn, PRBool moveToTrash, PRBool sync)
static void CreateDeleterThread(nsITimer *aTimer, void *arg)
{
nsIFile *dir = static_cast<nsIFile *>(arg);
// create the worker thread
PR_CreateThread(PR_USER_THREAD, DeleteDirThreadFunc, dir, PR_PRIORITY_LOW,
PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
}
nsresult DeleteDir(nsIFile *dirIn, PRBool moveToTrash, PRBool sync,
PRUint32 delay)
{
Telemetry::AutoTimer<Telemetry::NETWORK_DISK_CACHE_TRASHRENAME> timer;
nsresult rv;
@ -82,9 +94,13 @@ nsresult DeleteDir(nsIFile *dirIn, PRBool moveToTrash, PRBool sync)
// TrashDir may already exist (if we crashed while deleting it, etc.)
// In that case current Cache dir should be small--just move it to
// subdirectory of TrashDir and eat the NTFS ACL overhead.
leaf.AppendInt(rand()); // support this happening multiple times
rv = dir->MoveToNative(trash, leaf);
if (NS_FAILED(rv))
return rvMove;
// Be paranoid and delete immediately if we're seeing old trash when
// we're creating a new one
delay = 0;
}
} else {
// we want to pass a clone of the original off to the worker thread.
@ -98,16 +114,15 @@ nsresult DeleteDir(nsIFile *dirIn, PRBool moveToTrash, PRBool sync)
if (sync) {
DeleteDirThreadFunc(trashRef);
} else {
// now, invoke the worker thread
PRThread *thread = PR_CreateThread(PR_USER_THREAD,
DeleteDirThreadFunc,
trashRef,
PR_PRIORITY_LOW,
PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD,
0);
if (!thread)
return NS_ERROR_UNEXPECTED;
if (delay) {
nsCOMPtr<nsITimer> timer = do_CreateInstance("@mozilla.org/timer;1", &rv);
if (NS_FAILED(rv))
return NS_ERROR_UNEXPECTED;
timer->InitWithFuncCallback(CreateDeleterThread, trashRef, delay,
nsITimer::TYPE_ONE_SHOT);
} else {
CreateDeleterThread(nsnull, trashRef);
}
}
return NS_OK;

9
netwerk/cache/nsDeleteDir.h vendored
View File

@ -59,8 +59,15 @@ class nsIFile;
*
* If the sync flag is true, then the delete operation runs to completion
* before this function returns. Otherwise, deletion occurs asynchronously.
*
* If 'delay' is non-zero, the directory will not be deleted until the
* specified number of milliseconds have passed. (The directory is still
* renamed immediately if 'moveToTrash' is passed, so upon return it is safe
* to create a directory with the same name). This parameter is ignored if
* 'sync' is true.
*/
NS_HIDDEN_(nsresult) DeleteDir(nsIFile *dir, PRBool moveToTrash, PRBool sync);
NS_HIDDEN_(nsresult) DeleteDir(nsIFile *dir, PRBool moveToTrash, PRBool sync,
PRUint32 delay = 0);
/**
* This routine returns the trash directory corresponding to the given

7
netwerk/cache/nsDiskCacheDevice.cpp vendored
View File

@ -994,7 +994,8 @@ nsDiskCacheDevice::OpenDiskCache()
rv = mCacheMap.Open(mCacheDirectory);
// move "corrupt" caches to trash
if (rv == NS_ERROR_FILE_CORRUPTED) {
rv = DeleteDir(mCacheDirectory, PR_TRUE, PR_FALSE);
// delay delete by 1 minute to avoid IO thrash at startup
rv = DeleteDir(mCacheDirectory, PR_TRUE, PR_FALSE, 60000);
if (NS_FAILED(rv))
return rv;
exists = PR_FALSE;
@ -1024,8 +1025,10 @@ nsDiskCacheDevice::OpenDiskCache()
GetTrashDir(mCacheDirectory, &trashDir);
if (trashDir) {
PRBool exists;
if (NS_SUCCEEDED(trashDir->Exists(&exists)) && exists)
if (NS_SUCCEEDED(trashDir->Exists(&exists)) && exists) {
// be paranoid and delete immediately if leftover
DeleteDir(trashDir, PR_FALSE, PR_FALSE);
}
}
}

22
netwerk/protocol/http/HttpBaseChannel.cpp
View File

@ -1295,20 +1295,20 @@ HttpBaseChannel::GetEntityID(nsACString& aEntityID)
return NS_ERROR_NOT_RESUMABLE;
}
// Don't return an entity if the server sent the following header:
// Accept-Ranges: none
// Not sending the Accept-Ranges header means we can still try
// sending range requests.
const char* acceptRanges =
mResponseHead->PeekHeader(nsHttp::Accept_Ranges);
if (acceptRanges &&
!nsHttp::FindToken(acceptRanges, "bytes", HTTP_HEADER_VALUE_SEPS)) {
return NS_ERROR_NOT_RESUMABLE;
}
PRUint64 size = LL_MAXUINT;
nsCAutoString etag, lastmod;
if (mResponseHead) {
// Don't return an entity if the server sent the following header:
// Accept-Ranges: none
// Not sending the Accept-Ranges header means we can still try
// sending range requests.
const char* acceptRanges =
mResponseHead->PeekHeader(nsHttp::Accept_Ranges);
if (acceptRanges &&
!nsHttp::FindToken(acceptRanges, "bytes", HTTP_HEADER_VALUE_SEPS)) {
return NS_ERROR_NOT_RESUMABLE;
}
size = mResponseHead->TotalEntitySize();
const char* cLastMod = mResponseHead->PeekHeader(nsHttp::Last_Modified);
if (cLastMod)

3
netwerk/protocol/websocket/PWebSocket.ipdl
View File

@ -70,9 +70,6 @@ child:
OnAcknowledge(PRUint32 aSize);
OnServerClose();
// Only sent in the event that AsyncOpen fails
AsyncOpenFailed();
__delete__();
};

13
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@ -1544,7 +1544,7 @@ WebSocketChannel::SetupRequest()
PR_Free(b64);
mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Sec-WebSocket-Key"),
secKeyString, PR_FALSE);
LOG(("WebSocketChannel::AsyncOpen(): client key %s\n", secKeyString.get()));
LOG(("WebSocketChannel::SetupRequest: client key %s\n", secKeyString.get()));
// prepare the value we expect to see in
// the sec-websocket-accept response header
@ -1559,7 +1559,7 @@ WebSocketChannel::SetupRequest()
NS_ENSURE_SUCCESS(rv, rv);
rv = hasher->Finish(PR_TRUE, mHashedSecret);
NS_ENSURE_SUCCESS(rv, rv);
LOG(("WebSocketChannel::AsyncOpen(): expected server key %s\n",
LOG(("WebSocketChannel::SetupRequest: expected server key %s\n",
mHashedSecret.get()));
return NS_OK;
@ -1583,7 +1583,7 @@ WebSocketChannel::ApplyForAdmission()
mAddress = hostName;
// expect the callback in ::OnLookupComplete
LOG(("WebSocketChannel::AsyncOpen(): checking for concurrent open\n"));
LOG(("WebSocketChannel::ApplyForAdmission: checking for concurrent open\n"));
nsCOMPtr<nsIThread> mainThread;
NS_GetMainThread(getter_AddRefs(mainThread));
dns->AsyncResolve(hostName, 0, this, mainThread, getter_AddRefs(mDNSRequest));
@ -1988,6 +1988,13 @@ WebSocketChannel::Close()
{
LOG(("WebSocketChannel::Close() %p\n", this));
NS_ABORT_IF_FALSE(NS_IsMainThread(), "not main thread");
if (!mTransport) {
LOG(("WebSocketChannel::Close() without transport - aborting."));
AbortSession(NS_ERROR_NOT_CONNECTED);
return NS_ERROR_NOT_CONNECTED;
}
if (mRequestedClose) {
LOG(("WebSocketChannel:: Double close error\n"));
return NS_ERROR_UNEXPECTED;

45
netwerk/protocol/websocket/WebSocketChannelChild.cpp
View File

@ -77,7 +77,6 @@ NS_INTERFACE_MAP_END
WebSocketChannelChild::WebSocketChannelChild(bool aSecure)
: mEventQ(static_cast<nsIWebSocketChannel*>(this))
, mIPCOpen(false)
, mCancelled(false)
{
LOG(("WebSocketChannelChild::WebSocketChannelChild() %p\n", this));
BaseWebSocketChannel::mEncrypted = aSecure;
@ -325,41 +324,6 @@ WebSocketChannelChild::OnServerClose()
}
}
class AsyncOpenFailedEvent : public ChannelEvent
{
public:
AsyncOpenFailedEvent(WebSocketChannelChild* aChild)
: mChild(aChild)
{}
void Run()
{
mChild->AsyncOpenFailed();
}
private:
WebSocketChannelChild* mChild;
};
bool
WebSocketChannelChild::RecvAsyncOpenFailed()
{
if (mEventQ.ShouldEnqueue()) {
mEventQ.Enqueue(new AsyncOpenFailedEvent(this));
} else {
AsyncOpenFailed();
}
return true;
}
void
WebSocketChannelChild::AsyncOpenFailed()
{
LOG(("WebSocketChannelChild::RecvAsyncOpenFailed() %p\n", this));
mCancelled = true;
if (mIPCOpen)
SendDeleteSelf();
}
NS_IMETHODIMP
WebSocketChannelChild::AsyncOpen(nsIURI *aURI,
const nsACString &aOrigin,
@ -401,9 +365,6 @@ WebSocketChannelChild::Close()
{
LOG(("WebSocketChannelChild::Close() %p\n", this));
if (mCancelled)
return NS_ERROR_UNEXPECTED;
if (!mIPCOpen || !SendClose())
return NS_ERROR_UNEXPECTED;
return NS_OK;
@ -414,9 +375,6 @@ WebSocketChannelChild::SendMsg(const nsACString &aMsg)
{
LOG(("WebSocketChannelChild::SendMsg() %p\n", this));
if (mCancelled)
return NS_ERROR_UNEXPECTED;
if (!mIPCOpen || !SendSendMsg(nsCString(aMsg)))
return NS_ERROR_UNEXPECTED;
return NS_OK;
@ -427,9 +385,6 @@ WebSocketChannelChild::SendBinaryMsg(const nsACString &aMsg)
{
LOG(("WebSocketChannelChild::SendBinaryMsg() %p\n", this));
if (mCancelled)
return NS_ERROR_UNEXPECTED;
if (!mIPCOpen || !SendSendBinaryMsg(nsCString(aMsg)))
return NS_ERROR_UNEXPECTED;
return NS_OK;

1
netwerk/protocol/websocket/WebSocketChannelChild.h
View File

@ -91,7 +91,6 @@ class WebSocketChannelChild : public BaseWebSocketChannel,
ChannelEventQueue mEventQ;
bool mIPCOpen;
bool mCancelled;
friend class StartEvent;
friend class StopEvent;

19
netwerk/protocol/websocket/WebSocketChannelParent.cpp
View File

@ -83,21 +83,25 @@ WebSocketChannelParent::RecvAsyncOpen(const IPC::URI& aURI,
do_CreateInstance("@mozilla.org/network/protocol;1?name=ws", &rv);
}
if (NS_FAILED(rv))
return CancelEarly();
goto fail;
rv = mChannel->SetNotificationCallbacks(this);
if (NS_FAILED(rv))
return CancelEarly();
goto fail;
rv = mChannel->SetProtocol(aProtocol);
if (NS_FAILED(rv))
return CancelEarly();
goto fail;
rv = mChannel->AsyncOpen(aURI, aOrigin, this, nsnull);
if (NS_FAILED(rv))
return CancelEarly();
goto fail;
return true;
fail:
mChannel = nsnull;
return SendOnStop(rv);
}
bool
@ -133,13 +137,6 @@ WebSocketChannelParent::RecvSendBinaryMsg(const nsCString& aMsg)
return true;
}
bool
WebSocketChannelParent::CancelEarly()
{
LOG(("WebSocketChannelParent::CancelEarly() %p\n", this));
return mIPCOpen ? SendAsyncOpenFailed() : true;
}
NS_IMETHODIMP
WebSocketChannelParent::GetInterface(const nsIID & iid, void **result NS_OUTPARAM)
{

1
netwerk/protocol/websocket/WebSocketChannelParent.h
View File

@ -71,7 +71,6 @@ class WebSocketChannelParent : public PWebSocketParent,
bool RecvSendMsg(const nsCString& aMsg);
bool RecvSendBinaryMsg(const nsCString& aMsg);
bool RecvDeleteSelf();
bool CancelEarly();
void ActorDestroy(ActorDestroyReason why);

2
parser/html/nsHtml5Speculation.h
View File

@ -100,4 +100,4 @@ class nsHtml5Speculation : public nsAHtml5TreeOpSink
nsTArray<nsHtml5TreeOperation> mOpQueue;
};
#endif // nsHtml5Speculation_h__
#endif // nsHtml5Speculation_h__

20
parser/html/nsHtml5SpeculativeLoad.cpp
View File

@ -58,19 +58,29 @@ nsHtml5SpeculativeLoad::Perform(nsHtml5TreeOpExecutor* aExecutor)
{
switch (mOpCode) {
case eSpeculativeLoadBase:
aExecutor->SetSpeculationBase(mUrl);
aExecutor->SetSpeculationBase(mUrl);
break;
case eSpeculativeLoadImage:
aExecutor->PreloadImage(mUrl, mCharsetOrCrossOrigin);
aExecutor->PreloadImage(mUrl, mCharsetOrCrossOrigin);
break;
case eSpeculativeLoadScript:
aExecutor->PreloadScript(mUrl, mCharsetOrCrossOrigin, mType);
aExecutor->PreloadScript(mUrl, mCharsetOrCrossOrigin, mTypeOrCharsetSource);
break;
case eSpeculativeLoadStyle:
aExecutor->PreloadStyle(mUrl, mCharsetOrCrossOrigin);
aExecutor->PreloadStyle(mUrl, mCharsetOrCrossOrigin);
break;
case eSpeculativeLoadManifest:
aExecutor->ProcessOfflineManifest(mUrl);
aExecutor->ProcessOfflineManifest(mUrl);
break;
case eSpeculativeLoadSetDocumentCharset: {
nsCAutoString narrowName;
CopyUTF16toUTF8(mCharsetOrCrossOrigin, narrowName);
NS_ASSERTION(mTypeOrCharsetSource.Length() == 1,
"Unexpected charset source string");
PRInt32 intSource = (PRInt32)mTypeOrCharsetSource.First();
aExecutor->SetDocumentCharsetAndSource(narrowName,
intSource);
}
break;
default:
NS_NOTREACHED("Bogus speculative load.");

46
parser/html/nsHtml5SpeculativeLoad.h
View File

@ -50,7 +50,8 @@ enum eHtml5SpeculativeLoad {
eSpeculativeLoadImage,
eSpeculativeLoadScript,
eSpeculativeLoadStyle,
eSpeculativeLoadManifest
eSpeculativeLoadManifest,
eSpeculativeLoadSetDocumentCharset
};
class nsHtml5SpeculativeLoad {
@ -82,7 +83,7 @@ class nsHtml5SpeculativeLoad {
mOpCode = eSpeculativeLoadScript;
mUrl.Assign(aUrl);
mCharsetOrCrossOrigin.Assign(aCharset);
mType.Assign(aType);
mTypeOrCharsetSource.Assign(aType);
}
inline void InitStyle(const nsAString& aUrl, const nsAString& aCharset) {
@ -100,7 +101,7 @@ class nsHtml5SpeculativeLoad {
* to document.write() never arises. The reason why a parser
* thread-discovered manifest gets loaded via the speculative load queue
* as opposed to tree operation queue is that the manifest must get
* processed before any actually speculative loads such as scripts. Thus,
* processed before any actual speculative loads such as scripts. Thus,
* manifests seen by the parser thread have to maintain the queue order
* relative to true speculative loads. See bug 541079.
*/
@ -111,17 +112,46 @@ class nsHtml5SpeculativeLoad {
mUrl.Assign(aUrl);
}
/**
* "Speculative" charset setting isn't truly speculative. If the charset
* is set via this operation, we are committed to it unless chardet or
* a late meta cause a reload. The reason why a parser
* thread-discovered charset gets communicated via the speculative load
* queue as opposed to tree operation queue is that the charset change
* must get processed before any actual speculative loads such as style
* sheets. Thus, encoding decisions by the parser thread have to maintain
* the queue order relative to true speculative loads. See bug 675499.
*/
inline void InitSetDocumentCharset(nsACString& aCharset,
PRInt32 aCharsetSource) {
NS_PRECONDITION(mOpCode == eSpeculativeLoadUninitialized,
"Trying to reinitialize a speculative load!");
mOpCode = eSpeculativeLoadSetDocumentCharset;
CopyUTF8toUTF16(aCharset, mCharsetOrCrossOrigin);
mTypeOrCharsetSource.Assign((PRUnichar)aCharsetSource);
}
void Perform(nsHtml5TreeOpExecutor* aExecutor);
private:
eHtml5SpeculativeLoad mOpCode;
nsString mUrl;
// If mOpCode is eSpeculativeLoadImage, this is the value of the
// "crossorigin" attribute. If mOpCode is eSpeculativeLoadStyle
// or eSpeculativeLoadScript then this is the value of the
// "charset" attribute. Otherwise it's empty.
/**
* If mOpCode is eSpeculativeLoadImage, this is the value of the
* "crossorigin" attribute. If mOpCode is eSpeculativeLoadStyle
* or eSpeculativeLoadScript then this is the value of the
* "charset" attribute. For eSpeculativeLoadSetDocumentCharset it is
* the charset that the document's charset is being set to. Otherwise
* it's empty.
*/
nsString mCharsetOrCrossOrigin;
nsString mType;
/**
* If mOpCode is eSpeculativeLoadSetDocumentCharset, this is a
* one-character string whose single character's code point is to be
* interpreted as a charset source integer. Otherwise, it is empty or
* the value of the type attribute.
*/
nsString mTypeOrCharsetSource;
};
#endif // nsHtml5SpeculativeLoad_h_

5
parser/html/nsHtml5TreeBuilderCppSupplement.h
View File

@ -643,9 +643,8 @@ void
nsHtml5TreeBuilder::SetDocumentCharset(nsACString& aCharset,
PRInt32 aCharsetSource)
{
nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
NS_ASSERTION(treeOp, "Tree op allocation failed.");
treeOp->Init(eTreeOpSetDocumentCharset, aCharset, aCharsetSource);
mSpeculativeLoadQueue.AppendElement()->InitSetDocumentCharset(aCharset,
aCharsetSource);
}
void

8
parser/html/nsHtml5TreeOperation.cpp
View File

@ -127,7 +127,6 @@ nsHtml5TreeOperation::~nsHtml5TreeOperation()
case eTreeOpAppendCommentToDocument:
delete[] mTwo.unicharPtr;
break;
case eTreeOpSetDocumentCharset:
case eTreeOpNeedsCharsetSwitchTo:
delete[] mOne.charPtr;
break;
@ -630,13 +629,6 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
aBuilder->FlushPendingAppendNotifications();
return rv;
}
case eTreeOpSetDocumentCharset: {
char* str = mOne.charPtr;
PRInt32 charsetSource = mInt;
nsDependentCString dependentString(str);
aBuilder->SetDocumentCharsetAndSource(dependentString, charsetSource);
return rv;
}
case eTreeOpNeedsCharsetSwitchTo: {
char* str = mOne.charPtr;
PRInt32 charsetSource = mInt;

1
parser/html/nsHtml5TreeOperation.h
View File

@ -73,7 +73,6 @@ enum eHtml5TreeOperation {
eTreeOpDoneAddingChildren,
eTreeOpDoneCreatingElement,
eTreeOpFlushPendingAppendNotifications,
eTreeOpSetDocumentCharset,
eTreeOpNeedsCharsetSwitchTo,
eTreeOpUpdateStyleSheet,
eTreeOpProcessMeta,

4
toolkit/components/feeds/Makefile.in
View File

@ -42,6 +42,10 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
TOOL_DIRS += test
endif
MODULE = feeds
LIBRARY_NAME = feed_s
MOZILLA_INTERNAL_API = 1

26
toolkit/components/feeds/nsScriptableUnescapeHTML.cpp
View File

@ -188,19 +188,21 @@ nsScriptableUnescapeHTML::ParseFragment(const nsAString &aFragment,
PR_FALSE,
PR_TRUE);
// Now, set the base URI on all subtree roots.
aBaseURI->GetSpec(spec);
nsAutoString spec16;
CopyUTF8toUTF16(spec, spec16);
nsIContent* node = fragment->GetFirstChild();
while (node) {
if (node->IsElement()) {
node->SetAttr(kNameSpaceID_XML,
nsGkAtoms::base,
nsGkAtoms::xml,
spec16,
PR_FALSE);
if (aBaseURI) {
aBaseURI->GetSpec(spec);
nsAutoString spec16;
CopyUTF8toUTF16(spec, spec16);
nsIContent* node = fragment->GetFirstChild();
while (node) {
if (node->IsElement()) {
node->SetAttr(kNameSpaceID_XML,
nsGkAtoms::base,
nsGkAtoms::xml,
spec16,
PR_FALSE);
}
node = node->GetNextSibling();
}
node = node->GetNextSibling();
}
}
if (fragment) {

52
toolkit/components/feeds/test/Makefile.in Normal file
View File

@ -0,0 +1,52 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2009
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = toolkit/components/feeds/test
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_bug675492.xul \
$(NULL)
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)

Some files were not shown because too many files have changed in this diff Show More