Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e60fe593236d (bug 918189)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-03-19 09:45:57 +01:00
parent 76217d976d
commit dd70a06887
6 changed files with 8 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
content/base/public/nsINode.h
View File

@ -64,17 +64,12 @@ inline bool IsSpaceCharacter(char aChar) {
return aChar == ' ' || aChar == '\t' || aChar == '\n' || aChar == '\r' || return aChar == ' ' || aChar == '\t' || aChar == '\n' || aChar == '\r' ||
aChar == '\f'; aChar == '\f';
} }
struct BoxQuadOptions;
struct ConvertCoordinateOptions;
class DOMPoint;
class DOMQuad;
class DOMRectReadOnly;
class Element; class Element;
struct BoxQuadOptions;
class DOMQuad;
class EventHandlerNonNull; class EventHandlerNonNull;
class OnErrorEventHandlerNonNull; class OnErrorEventHandlerNonNull;
template<typename T> class Optional; template<typename T> class Optional;
class TextOrElementOrDocument;
struct DOMPointInit;
} // namespace dom } // namespace dom
} // namespace mozilla } // namespace mozilla
@ -286,12 +281,7 @@ class nsINode : public mozilla::dom::EventTarget
{ {
public: public:
typedef mozilla::dom::BoxQuadOptions BoxQuadOptions; typedef mozilla::dom::BoxQuadOptions BoxQuadOptions;
typedef mozilla::dom::ConvertCoordinateOptions ConvertCoordinateOptions;
typedef mozilla::dom::DOMPoint DOMPoint;
typedef mozilla::dom::DOMPointInit DOMPointInit;
typedef mozilla::dom::DOMQuad DOMQuad; typedef mozilla::dom::DOMQuad DOMQuad;
typedef mozilla::dom::DOMRectReadOnly DOMRectReadOnly;
typedef mozilla::dom::TextOrElementOrDocument TextOrElementOrDocument;
typedef mozilla::ErrorResult ErrorResult; typedef mozilla::ErrorResult ErrorResult;
NS_DECLARE_STATIC_IID_ACCESSOR(NS_INODE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(NS_INODE_IID)
@ -1629,19 +1619,6 @@ public:
nsTArray<nsRefPtr<DOMQuad> >& aResult, nsTArray<nsRefPtr<DOMQuad> >& aResult,
mozilla::ErrorResult& aRv); mozilla::ErrorResult& aRv);
already_AddRefed<DOMQuad> ConvertQuadFromNode(DOMQuad& aQuad,
const TextOrElementOrDocument& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv);
already_AddRefed<DOMQuad> ConvertRectFromNode(DOMRectReadOnly& aRect,
const TextOrElementOrDocument& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv);
already_AddRefed<DOMPoint> ConvertPointFromNode(const DOMPointInit& aPoint,
const TextOrElementOrDocument& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv);
protected: protected:
// Override this function to create a custom slots class. // Override this function to create a custom slots class.

27
content/base/src/nsINode.cpp
View File

@ -1149,33 +1149,6 @@ nsINode::GetBoxQuads(const BoxQuadOptions& aOptions,
mozilla::GetBoxQuads(this, aOptions, aResult, aRv); mozilla::GetBoxQuads(this, aOptions, aResult, aRv);
} }
already_AddRefed<DOMQuad>
nsINode::ConvertQuadFromNode(DOMQuad& aQuad,
const GeometryNode& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv)
{
return mozilla::ConvertQuadFromNode(this, aQuad, aFrom, aOptions, aRv);
}
already_AddRefed<DOMQuad>
nsINode::ConvertRectFromNode(DOMRectReadOnly& aRect,
const GeometryNode& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv)
{
return mozilla::ConvertRectFromNode(this, aRect, aFrom, aOptions, aRv);
}
already_AddRefed<DOMPoint>
nsINode::ConvertPointFromNode(const DOMPointInit& aPoint,
const GeometryNode& aFrom,
const ConvertCoordinateOptions& aOptions,
ErrorResult& aRv)
{
return mozilla::ConvertPointFromNode(this, aPoint, aFrom, aOptions, aRv);
}
nsresult nsresult
nsINode::DispatchEvent(nsIDOMEvent *aEvent, bool* aRetVal) nsINode::DispatchEvent(nsIDOMEvent *aEvent, bool* aRetVal)
{ {

9
dom/webidl/GeometryUtils.webidl
View File

@ -25,12 +25,9 @@ dictionary ConvertCoordinateOptions {
interface GeometryUtils { interface GeometryUtils {
[Throws, Pref="layout.css.getBoxQuads.enabled"] [Throws, Pref="layout.css.getBoxQuads.enabled"]
sequence<DOMQuad> getBoxQuads(optional BoxQuadOptions options); sequence<DOMQuad> getBoxQuads(optional BoxQuadOptions options);
[Throws, Pref="layout.css.convertFromNode.enabled"] // DOMQuad convertQuadFromNode(DOMQuad quad, GeometryNode from, optional ConvertCoordinateOptions options);
DOMQuad convertQuadFromNode(DOMQuad quad, GeometryNode from, optional ConvertCoordinateOptions options); // DOMQuad convertRectFromNode(DOMRectReadOnly rect, GeometryNode from, optional ConvertCoordinateOptions options);
[Throws, Pref="layout.css.convertFromNode.enabled"] // DOMPoint convertPointFromNode(DOMPointInit point, GeometryNode from, optional ConvertCoordinateOptions options);
DOMQuad convertRectFromNode(DOMRectReadOnly rect, GeometryNode from, optional ConvertCoordinateOptions options);
[Throws, Pref="layout.css.convertFromNode.enabled"]
DOMPoint convertPointFromNode(DOMPointInit point, GeometryNode from, optional ConvertCoordinateOptions options);
}; };
Text implements GeometryUtils; Text implements GeometryUtils;

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

@ -2932,7 +2932,7 @@ nsHTMLEditRules::MoveBlock(nsIDOMNode *aLeftBlock, nsIDOMNode *aRightBlock, int3
nsCOMArray<nsIDOMNode> arrayOfNodes; nsCOMArray<nsIDOMNode> arrayOfNodes;
nsCOMPtr<nsISupports> isupports; nsCOMPtr<nsISupports> isupports;
// GetNodesFromPoint is the workhorse that figures out what we wnat to move. // GetNodesFromPoint is the workhorse that figures out what we wnat to move.
nsresult res = GetNodesFromPoint(::DOMPoint(aRightBlock,aRightOffset), nsresult res = GetNodesFromPoint(DOMPoint(aRightBlock,aRightOffset),
EditAction::makeList, arrayOfNodes, true); EditAction::makeList, arrayOfNodes, true);
NS_ENSURE_SUCCESS(res, res); NS_ENSURE_SUCCESS(res, res);
int32_t listCount = arrayOfNodes.Count(); int32_t listCount = arrayOfNodes.Count();
@ -6459,7 +6459,7 @@ nsHTMLEditRules::GetHighestInlineParent(nsIDOMNode* aNode)
// of nodes from a point that will be operated on. // of nodes from a point that will be operated on.
// //
nsresult nsresult
nsHTMLEditRules::GetNodesFromPoint(::DOMPoint point, nsHTMLEditRules::GetNodesFromPoint(DOMPoint point,
EditAction operation, EditAction operation,
nsCOMArray<nsIDOMNode> &arrayOfNodes, nsCOMArray<nsIDOMNode> &arrayOfNodes,
bool dontTouchContent) bool dontTouchContent)

3
layout/base/tests/test_getBoxQuads_convertPointRectQuad.html
View File

@ -216,8 +216,7 @@ window.scrollTo(0,0);
function startTest() { function startTest() {
SpecialPowers.pushPrefEnv({"set": [["layout.css.DOMPoint.enabled", true], SpecialPowers.pushPrefEnv({"set": [["layout.css.DOMPoint.enabled", true],
["layout.css.DOMQuad.enabled", true], ["layout.css.DOMQuad.enabled", true],
["layout.css.getBoxQuads.enabled", true], ["layout.css.getBoxQuads.enabled", true]]}, runTest);
["layout.css.convertFromNode.enabled", true]]}, runTest);
} }
function runTest() { function runTest() {

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

@ -1815,13 +1815,6 @@ pref("layout.css.getBoxQuads.enabled", false);
pref("layout.css.getBoxQuads.enabled", true); pref("layout.css.getBoxQuads.enabled", true);
#endif #endif
// Is support for GeometryUtils.getBoxQuads enabled?
#ifdef RELEASE_BUILD
pref("layout.css.convertFromNode.enabled", false);
#else
pref("layout.css.convertFromNode.enabled", true);
#endif
// Is support for CSS "text-align: true X" enabled? // Is support for CSS "text-align: true X" enabled?
pref("layout.css.text-align-true-value.enabled", false); pref("layout.css.text-align-true-value.enabled", false);