wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge inbound to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-03-24 16:47:07 -04:00
commit 6f72275f13
193 changed files with 992 additions and 986 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/installer/package-manifest.in
View File

@ -174,7 +174,6 @@
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_devicestorage.xpt
@BINPATH@/components/dom_events.xpt
@BINPATH@/components/dom_file.xpt
@BINPATH@/components/dom_geolocation.xpt
@BINPATH@/components/dom_media.xpt
@BINPATH@/components/dom_network.xpt

1
browser/installer/package-manifest.in
View File

@ -197,7 +197,6 @@
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_devicestorage.xpt
@BINPATH@/components/dom_events.xpt
@BINPATH@/components/dom_file.xpt
@BINPATH@/components/dom_geolocation.xpt
@BINPATH@/components/dom_media.xpt
@BINPATH@/components/dom_network.xpt

11
content/base/src/FragmentOrElement.cpp
View File

@ -2361,20 +2361,21 @@ StartElement(Element* aContent, StringBuilder& aBuilder)
continue;
}
aBuilder.Append(" ");
if (MOZ_LIKELY(attNs == kNameSpaceID_None) ||
(attNs == kNameSpaceID_XMLNS &&
attName == nsGkAtoms::xmlns)) {
aBuilder.Append(" ");
// Nothing else required
} else if (attNs == kNameSpaceID_XML) {
aBuilder.Append(" xml:");
aBuilder.Append("xml:");
} else if (attNs == kNameSpaceID_XMLNS) {
aBuilder.Append(" xmlns:");
aBuilder.Append("xmlns:");
} else if (attNs == kNameSpaceID_XLink) {
aBuilder.Append(" xlink:");
aBuilder.Append("xlink:");
} else {
nsIAtom* prefix = name->GetPrefix();
if (prefix) {
aBuilder.Append(" ");
aBuilder.Append(prefix);
aBuilder.Append(":");
}

6
content/base/test/test_bug744830.html
View File

@ -88,6 +88,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=744830
t.firstChild.textContent = "1&2<3>4\xA0";
is(t.innerHTML, '<style>1&2<3>4\xA0\u003C/style>');
t.innerHTML = null;
t.appendChild(document.createElement("span"));
t.firstChild.setAttributeNS("ext", "attr", "foo");
t.firstChild.textContent = "1&2<3>4\xA0";
is(t.innerHTML, '<span attr="foo">1&amp;2&lt;3&gt;4&nbsp;\u003C/span>');
t.innerHTML = null;
t.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "svg"));
is(t.firstChild.namespaceURI, "http://www.w3.org/2000/svg");

15
content/canvas/src/CanvasRenderingContext2D.cpp
View File

@ -94,6 +94,7 @@
#include "nsGlobalWindow.h"
#include "GLContext.h"
#include "GLContextProvider.h"
#include "SVGContentUtils.h"
#undef free // apparently defined by some windows header, clashing with a free()
// method in SkTypes.h
@ -857,7 +858,7 @@ CanvasRenderingContext2D::EnsureTarget()
SkiaGLGlue* glue = gfxPlatform::GetPlatform()->GetSkiaGLGlue();
if (glue) {
if (glue && glue->GetGrContext() && glue->GetGLContext()) {
mTarget = Factory::CreateDrawTargetSkiaWithGrContext(glue->GetGrContext(), size, format);
if (mTarget) {
mStream = gfx::SurfaceStream::CreateForType(SurfaceStreamType::TripleBuffer, glue->GetGLContext());
@ -4362,6 +4363,18 @@ CanvasPath::Constructor(const GlobalObject& aGlobal, CanvasPath& aCanvasPath, Er
return path.forget();
}
already_AddRefed<CanvasPath>
CanvasPath::Constructor(const GlobalObject& aGlobal, const nsAString& aPathString, ErrorResult& aRv)
{
RefPtr<gfx::Path> tempPath = SVGContentUtils::GetPath(aPathString);
if (!tempPath) {
return Constructor(aGlobal, aRv);
}
nsRefPtr<CanvasPath> path = new CanvasPath(aGlobal.GetAsSupports(), tempPath->CopyToBuilder());
return path.forget();
}
void
CanvasPath::ClosePath()
{

3
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -61,6 +61,9 @@ public:
static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
CanvasPath& aCanvasPath,
ErrorResult& rv);
static already_AddRefed<CanvasPath> Constructor(const GlobalObject& aGlobal,
const nsAString& aPathString,
ErrorResult& rv);
void ClosePath();
void MoveTo(double x, double y);

1
content/canvas/src/moz.build
View File

@ -97,6 +97,7 @@ FINAL_LIBRARY = 'gklayout'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/html/content/src',
'/content/svg/content/src',
'/content/xul/content/src',
'/dom/base',
'/image/src',

3
content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>WebGL cross-origin textures test</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>
@ -64,7 +63,7 @@
image.src = url;
}
MochiKit.DOM.addLoadEvent(function () {
addLoadEvent(function () {
var canvas = document.getElementById("canvas");
gl = canvas.getContext("experimental-webgl");
if (!gl) {

1
content/canvas/test/test_2d.clip.winding.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.clip.winding</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.color-burn.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.color-dodge.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.color.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.darken.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.destination-atop.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.destination-atop</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.destination-in.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.destination-in</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.difference.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.exclusion.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.hard-light.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.hue.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.lighten.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.lighter.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.luminosity.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.multiply.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.overlay.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.saturation.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.screen.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.soft-light.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.source-in.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.source-in</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.source-out.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.source-out</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.canvas.xor.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.clip.lighter.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.clip.lighter</title>
<!-- Testing: fill() does not affect pixels outside the clip region. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.clip.xor.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.clip.xor</title>
<!-- Testing: fill() does not affect pixels outside the clip region. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.destination-atop.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.destination-atop</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.destination-in.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.destination-in</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.lighter.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.source-in.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.source-in</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.source-out.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.source-out</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.image.xor.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.image.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.color-burn.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.color-dodge.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.color.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.darken.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.difference.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.exclusion.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.hard-light.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.hue.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.lighten.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.lighter.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.luminosity.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.multiply.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.overlay.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.saturation.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.screen.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.soft-light.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.solid.xor.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.solid.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.transparent.lighter.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.transparent.lighter</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.transparent.xor.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.transparent.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.color.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.darken.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.destination-atop</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.destination-in</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.difference.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.hue.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.lighten.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.multiply.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.overlay.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.saturation.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.screen.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-in</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.pattern.destination-atop</title>
<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.pattern.destination-in</title>
<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.pattern.source-in</title>
<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.uncovered.pattern.source-out</title>
<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.drawImage.zerocanvas.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.drawImage.zerocanvas</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.fill.winding.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.fill.winding</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.fillText.gradient.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.composite.canvas.xor</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.cone.behind.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.cone.behind</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.cone.beside.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.cone.beside</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.cone.shape2.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.cone.shape2</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.equal.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.equal</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.outside2.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.outside2</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.outside3.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.outside3</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.touch1.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.touch1</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.touch2.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.touch2</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.gradient.radial.touch3.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.gradient.radial.touch3</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.isPointInPath.winding.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.isPointInPath.winding</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.path.arc.shape.3.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.path.arc.shape.3</title>
<!-- Testing: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant -->
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.path.rect.selfintersect.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.path.rect.selfintersect</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_2d.path.rect.zero.6.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: 2d.path.rect.zero.6</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_bug902651.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: canvas demotion</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

23
content/canvas/test/test_canvas_path.html
View File

@ -315,6 +315,23 @@ function test_isPointInStroke_canvas() {
}
</script>
<p>Canvas test: test_pathconstructor_canvas</p>
<canvas id="c7" class="output" width="200" height="100">+
</canvas>
<script type="text/javascript">
function test_pathconstructor_canvas() {
var c = document.getElementById("c7");
var ctx = c.getContext("2d");
var p = new Path2D("M100,0L200,0L200,100L100,100z");
ctx.fillStyle = 'blue';
ctx.fill(p);
isPixel(ctx, 105, 5, [0, 0, 255, 255], 0);
isPixel(ctx, 5, 5, [0, 0, 0, 0], 0);
}
</script>
<script>
function runTests() {
@ -354,6 +371,12 @@ function runTests() {
throw e;
ok(false, "unexpected exception thrown in: test_isPointInStroke_canvas");
}
try {
test_pathconstructor_canvas();
} catch(e) {
throw e;
ok(false, "unexpected exception thrown in: test_pathconstructor_canvas");
}
SpecialPowers.setBoolPref("canvas.path.enabled", false);
SimpleTest.finish();
}

1
content/canvas/test/test_mozGetAsFile.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: mozGetAsFile</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

1
content/canvas/test/test_toBlob.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE HTML>
<title>Canvas test: toBlob</title>
<script src="/MochiKit/MochiKit.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
<body>

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