Chrome side of webkit merge to 40124.
Not much here other than CanvasPixelArray being re-added in webkit@r40089. Changes: http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk Review URL: http://codereview.chromium.org/16617 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
tc@google.com
DEPSWEBKIT_MERGE_REVISION
webkit
build
data
layout_tests
platform
chromium-win
LayoutTests
glue
port
tools
layout_tests
test_lists
webkit.xcodeproj
8
DEPS
8
DEPS
@ -12,7 +12,7 @@ deps = {
|
||||
"http://googletest.googlecode.com/svn/trunk@167",
|
||||
|
||||
"src/third_party/WebKit":
|
||||
"/trunk/deps/third_party/WebKit@8457",
|
||||
"/trunk/deps/third_party/WebKit@8513",
|
||||
|
||||
"src/third_party/icu38":
|
||||
"/trunk/deps/third_party/icu38@7525",
|
||||
@ -21,13 +21,13 @@ deps = {
|
||||
"http://v8.googlecode.com/svn/trunk@1103",
|
||||
|
||||
"src/webkit/data/layout_tests/LayoutTests":
|
||||
"http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40086",
|
||||
"http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40124",
|
||||
|
||||
"src/third_party/WebKit/WebKit":
|
||||
"http://svn.webkit.org/repository/webkit/trunk/WebKit@40086",
|
||||
"http://svn.webkit.org/repository/webkit/trunk/WebKit@40124",
|
||||
|
||||
"src/third_party/WebKit/WebKitLibraries":
|
||||
"http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40086",
|
||||
"http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40124",
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
http://svn.webkit.org/repository/webkit/trunk@40086
|
||||
http://svn.webkit.org/repository/webkit/trunk@40124
|
||||
@ -321,7 +321,6 @@ inputs = [
|
||||
'$DERIVED_DIR/V8XPathResult.cpp',
|
||||
'$DERIVED_DIR/V8XSLTProcessor.cpp',
|
||||
|
||||
'$PORT_DIR/bindings/v8/CanvasPixelArray.cpp',
|
||||
'$PORT_DIR/bindings/v8/JSDOMBinding.cpp',
|
||||
'$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp',
|
||||
'$PORT_DIR/bindings/v8/np_v8object.cpp',
|
||||
|
||||
@ -2500,10 +2500,6 @@
|
||||
RelativePath=".\precompiled_v8bindings.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\port\bindings\v8\CanvasPixelArray.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\port\bindings\v8\RGBColor.cpp"
|
||||
>
|
||||
@ -2552,10 +2548,6 @@
|
||||
RelativePath="..\..\port\bindings\v8\ScriptInstance.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\port\bindings\v8\CanvasPixelArray.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\port\bindings\v8\ScriptSourceCode.h"
|
||||
>
|
||||
|
||||
@ -240,6 +240,7 @@ input_files = [
|
||||
|
||||
'$WEBCORE_DIR/html/CanvasGradient.cpp',
|
||||
'$WEBCORE_DIR/html/CanvasPattern.cpp',
|
||||
'$WEBCORE_DIR/html/CanvasPixelArray.cpp',
|
||||
'$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp',
|
||||
'$WEBCORE_DIR/html/CanvasStyle.cpp',
|
||||
'$WEBCORE_DIR/html/File.cpp',
|
||||
@ -343,6 +344,7 @@ input_files = [
|
||||
'$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
|
||||
'$WEBCORE_DIR/loader/DocLoader.cpp',
|
||||
'$WEBCORE_DIR/loader/DocumentLoader.cpp',
|
||||
'$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp',
|
||||
'$WEBCORE_DIR/loader/FormState.cpp',
|
||||
'$WEBCORE_DIR/loader/FrameLoader.cpp',
|
||||
'$WEBCORE_DIR/loader/FrameLoaderClient.cpp',
|
||||
@ -362,6 +364,7 @@ input_files = [
|
||||
'$WEBCORE_DIR/loader/SubresourceLoader.cpp',
|
||||
'$WEBCORE_DIR/loader/TextDocument.cpp',
|
||||
'$WEBCORE_DIR/loader/TextResourceDecoder.cpp',
|
||||
'$WEBCORE_DIR/loader/ThreadableLoader.cpp',
|
||||
|
||||
'$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp',
|
||||
'$WEBCORE_DIR/loader/archive/ArchiveResource.cpp',
|
||||
@ -539,6 +542,7 @@ input_files = [
|
||||
'$WEBCORE_DIR/platform/network/Credential.cpp',
|
||||
'$WEBCORE_DIR/platform/network/FormData.cpp',
|
||||
'$WEBCORE_DIR/platform/network/FormDataBuilder.cpp',
|
||||
'$WEBCORE_DIR/platform/network/HTTPHeaderMap.cpp',
|
||||
'$WEBCORE_DIR/platform/network/HTTPParsers.cpp',
|
||||
'$WEBCORE_DIR/platform/network/NetworkStateNotifier.cpp',
|
||||
'$WEBCORE_DIR/platform/network/ProtectionSpace.cpp',
|
||||
@ -867,7 +871,6 @@ input_files = [
|
||||
'$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
|
||||
'$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
|
||||
|
||||
'$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerSkia.cpp',
|
||||
'$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp',
|
||||
'$WEBCORE_DIR/svg/graphics/skia/SVGResourceMaskerSkia.cpp',
|
||||
|
||||
|
||||
@ -674,6 +674,14 @@
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\EmptyClients.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FormState.cpp"
|
||||
>
|
||||
@ -838,6 +846,18 @@
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\TextResourceDecoder.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\ThreadableLoaderClient.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="archive"
|
||||
>
|
||||
@ -1773,6 +1793,10 @@
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\FormDataBuilder.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\HTTPHeaderMap.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\HTTPHeaderMap.h"
|
||||
>
|
||||
@ -5290,6 +5314,14 @@
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPattern.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasRenderingContext2D.cpp"
|
||||
>
|
||||
@ -7212,10 +7244,6 @@
|
||||
<Filter
|
||||
Name="skia"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerSkia.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp"
|
||||
>
|
||||
|
||||
@ -150,7 +150,6 @@ else:
|
||||
|
||||
|
||||
idl_files = [
|
||||
'bindings/v8/CanvasPixelArray.idl',
|
||||
'bindings/v8/UndetectableHTMLCollection.idl',
|
||||
|
||||
'css/Counter.idl',
|
||||
@ -228,6 +227,7 @@ idl_files = [
|
||||
|
||||
'html/CanvasGradient.idl',
|
||||
'html/CanvasPattern.idl',
|
||||
'html/CanvasPixelArray.idl',
|
||||
'html/CanvasRenderingContext2D.idl',
|
||||
'html/File.idl',
|
||||
'html/FileList.idl',
|
||||
|
||||
@ -12,6 +12,7 @@ PASS characterSwitch('B') is "B"
|
||||
PASS characterSwitch('') is "default"
|
||||
PASS characterSwitch({toString: function(){return 'B'}}) is "default"
|
||||
PASS characterSwitch(0) is "default"
|
||||
PASS characterSwitch(-0) is "default"
|
||||
PASS characterSwitch(1) is "default"
|
||||
PASS characterSwitch(-1) is "default"
|
||||
PASS characterSwitch(-1000000000) is "default"
|
||||
@ -26,6 +27,7 @@ PASS sparseCharacterSwitch('B') is "B"
|
||||
PASS sparseCharacterSwitch('') is ""
|
||||
PASS sparseCharacterSwitch({toString: function(){return 'B'}}) is "default"
|
||||
PASS sparseCharacterSwitch(0) is "default"
|
||||
PASS sparseCharacterSwitch(-0) is "default"
|
||||
PASS sparseCharacterSwitch(1) is "default"
|
||||
PASS sparseCharacterSwitch(-1) is "default"
|
||||
PASS sparseCharacterSwitch(-1000000000) is "default"
|
||||
@ -42,6 +44,7 @@ PASS stringSwitch('some string') is "some string"
|
||||
PASS stringSwitch({toString: function(){return 'some string'}}) is "default"
|
||||
PASS stringSwitch('s') is "default"
|
||||
PASS stringSwitch(0) is "default"
|
||||
PASS stringSwitch(-0) is "default"
|
||||
PASS stringSwitch(1) is "default"
|
||||
PASS stringSwitch(-1) is "default"
|
||||
PASS stringSwitch(-1000000000) is "default"
|
||||
@ -58,6 +61,7 @@ PASS numberSwitch('some string') is "default"
|
||||
PASS numberSwitch({valueOf: function(){return 0}}) is "default"
|
||||
PASS numberSwitch('s') is "default"
|
||||
PASS numberSwitch(0) is 0
|
||||
PASS numberSwitch(-0) is 0
|
||||
PASS numberSwitch(1) is 1
|
||||
PASS numberSwitch(-1) is -1
|
||||
PASS numberSwitch(-1000000000) is "default"
|
||||
@ -74,6 +78,7 @@ PASS sparseNumberSwitch('some string') is "default"
|
||||
PASS sparseNumberSwitch({valueOf: function(){return 0}}) is "default"
|
||||
PASS sparseNumberSwitch('s') is "default"
|
||||
PASS sparseNumberSwitch(0) is 0
|
||||
PASS sparseNumberSwitch(-0) is 0
|
||||
PASS sparseNumberSwitch(1) is 1
|
||||
PASS sparseNumberSwitch(-1) is -1
|
||||
PASS sparseNumberSwitch(-1000000000) is -1000000000
|
||||
@ -90,6 +95,7 @@ PASS generalSwitch('some string') is "some string"
|
||||
PASS generalSwitch({valueOf: function(){return 0}}) is "default"
|
||||
PASS generalSwitch('s') is "default"
|
||||
PASS generalSwitch(0) is 0
|
||||
PASS generalSwitch(-0) is 0
|
||||
PASS generalSwitch(1) is 1
|
||||
PASS generalSwitch(-1) is -1
|
||||
PASS generalSwitch(-1000000000) is -1000000000
|
||||
@ -98,3 +104,4 @@ PASS generalSwitch({}) is "default"
|
||||
PASS successfullyParsed is true
|
||||
|
||||
TEST COMPLETE
|
||||
|
||||
|
||||
@ -1755,8 +1755,10 @@ bool WebFrameImpl::SetPrintingMode(bool printing,
|
||||
pages_.clear();
|
||||
|
||||
// The document width is well hidden.
|
||||
if (width)
|
||||
*width = frame()->document()->renderer()->width();
|
||||
if (width) {
|
||||
WebCore::RenderObject* obj = frame()->document()->renderer();
|
||||
*width = WebCore::RenderBox::toRenderBox(obj)->width();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
|
||||
#include "PlatformContextSkia.h"
|
||||
#include "PlatformMouseEvent.h"
|
||||
#include "PlatformString.h"
|
||||
#include "RenderBox.h"
|
||||
#include "ResourceHandle.h"
|
||||
#include "ResourceHandleClient.h"
|
||||
#include "ResourceResponse.h"
|
||||
@ -633,7 +634,8 @@ void WebPluginImpl::windowCutoutRects(
|
||||
if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) {
|
||||
if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) {
|
||||
WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute());
|
||||
WebCore::IntSize size(ro->width(), ro->height());
|
||||
WebCore::RenderBox* rbox = WebCore::RenderBox::toRenderBox(ro);
|
||||
WebCore::IntSize size(rbox->width(), rbox->height());
|
||||
cutouts->append(WebCore::IntRect(point, size));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2009, Google Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following disclaimer
|
||||
* in the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Google Inc. nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <CanvasPixelArray.h>
|
||||
|
||||
#include <v8_proxy.h>
|
||||
#include <wtf/Assertions.h>
|
||||
|
||||
namespace WebCore {
|
||||
|
||||
CanvasPixelArray::CanvasPixelArray(size_t length)
|
||||
{
|
||||
ASSERT((length & 3) == 0); // Length must be a multiple of 4.
|
||||
m_length = length;
|
||||
m_data = static_cast<unsigned char*>(fastMalloc(m_length));
|
||||
}
|
||||
|
||||
CanvasPixelArray::~CanvasPixelArray()
|
||||
{
|
||||
fastFree(m_data);
|
||||
// Ensure that accesses after destruction will fail. In case there is a
|
||||
// dangling reference.
|
||||
m_length = 0;
|
||||
m_data = reinterpret_cast<unsigned char*>(-1);
|
||||
}
|
||||
|
||||
size_t CanvasPixelArray::length() const
|
||||
{
|
||||
return m_length;
|
||||
}
|
||||
|
||||
unsigned char* CanvasPixelArray::data()
|
||||
{
|
||||
return m_data;
|
||||
}
|
||||
|
||||
unsigned char CanvasPixelArray::get(size_t index)
|
||||
{
|
||||
ASSERT(index < m_length);
|
||||
return m_data[index];
|
||||
}
|
||||
|
||||
void CanvasPixelArray::set(size_t index, double value)
|
||||
{
|
||||
ASSERT(index < m_length);
|
||||
if (!(value > 0)) { // Test for NaN and less than zero in one go.
|
||||
value = 0;
|
||||
} else if (value > 255) {
|
||||
value = 255;
|
||||
}
|
||||
m_data[index] = static_cast<unsigned char>(value + 0.5);
|
||||
}
|
||||
|
||||
} // namespace WebCore
|
||||
@ -1,64 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2009, Google Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are
|
||||
* met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following disclaimer
|
||||
* in the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Google Inc. nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from
|
||||
* this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CanvasPixelArray_h
|
||||
#define CanvasPixelArray_h
|
||||
|
||||
#include "v8.h"
|
||||
#include <wtf/Forward.h>
|
||||
#include <wtf/PassRefPtr.h>
|
||||
#include <wtf/RefCounted.h>
|
||||
|
||||
namespace WebCore {
|
||||
|
||||
class CanvasPixelArray : public RefCounted<CanvasPixelArray> {
|
||||
public:
|
||||
static PassRefPtr<CanvasPixelArray> create(size_t length)
|
||||
{
|
||||
return adoptRef(new CanvasPixelArray(length));
|
||||
}
|
||||
~CanvasPixelArray();
|
||||
|
||||
size_t length() const;
|
||||
unsigned char* data();
|
||||
|
||||
unsigned char get(size_t index);
|
||||
void set(size_t index, double value);
|
||||
|
||||
private:
|
||||
size_t m_length;
|
||||
unsigned char* m_data;
|
||||
|
||||
CanvasPixelArray(size_t length);
|
||||
};
|
||||
|
||||
} // namespace WebCore
|
||||
|
||||
#endif // CanvasPixelArray_h
|
||||
@ -1,35 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Apple Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
module html {
|
||||
|
||||
interface [
|
||||
HasCustomIndexGetter,
|
||||
HasCustomIndexSetter
|
||||
] CanvasPixelArray {
|
||||
readonly attribute long length;
|
||||
};
|
||||
|
||||
}
|
||||
@ -47,11 +47,15 @@ INDEXED_PROPERTY_GETTER(CanvasPixelArray) {
|
||||
V8Proxy::ToNativeObject<CanvasPixelArray>(
|
||||
V8ClassIndex::CANVASPIXELARRAY,
|
||||
info.Holder());
|
||||
|
||||
|
||||
if ((index < 0) || (index >= pixelBuffer->length())) {
|
||||
return v8::Undefined();
|
||||
}
|
||||
return v8::Number::New(pixelBuffer->get(index));
|
||||
unsigned char result;
|
||||
if (!pixelBuffer->get(index, result)) {
|
||||
return v8::Undefined();
|
||||
}
|
||||
return v8::Number::New(result);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1858,3 +1858,7 @@ LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-15-t.svg = FAIL
|
||||
// These two appear to have been failing before the merge.
|
||||
LINUX : LayoutTests/svg/custom/circular-marker-reference-3.svg = FAIL
|
||||
LINUX : LayoutTests/svg/custom/circular-marker-reference-4.svg = FAIL
|
||||
|
||||
// Merge 40086:40124 -- new test
|
||||
// This needs layoutTestController.numberOfActiveAnimations implemented.
|
||||
LayoutTests/transitions/repeated-firing-background-color.html = TIMEOUT
|
||||
|
||||
@ -54,6 +54,10 @@
|
||||
4DB7FE770E9BF6D800C66CE0 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7FE6A0E9BF69A00C66CE0 /* WebSystemInterface.m */; };
|
||||
535EE0C00EC4D10E00939D54 /* clipboard_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = 535EE0BE0EC4D10E00939D54 /* clipboard_conversion.cc */; };
|
||||
538D819B0EC371EA00278C31 /* password_autocomplete_listener.cc in Sources */ = {isa = PBXBuildFile; fileRef = 538D81990EC371EA00278C31 /* password_autocomplete_listener.cc */; };
|
||||
53AAC3700F291E8000233688 /* CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC36F0F291E8000233688 /* CanvasPixelArray.cpp */; };
|
||||
53AAC37D0F291F0F00233688 /* DocumentThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC37C0F291F0F00233688 /* DocumentThreadableLoader.cpp */; };
|
||||
53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC37F0F291F4300233688 /* ThreadableLoader.cpp */; };
|
||||
53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */; };
|
||||
53E8BE100EC36A4E00B3F8B0 /* dom_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405050D92E3DA0006B936 /* dom_operations.cc */; };
|
||||
7B1438070E7874FC00901940 /* webframeloaderclient_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254053F0D92E3DA0006B936 /* webframeloaderclient_impl.cc */; };
|
||||
7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85B60D7F28F5001ECF42 /* Assertions.cpp */; };
|
||||
@ -77,7 +81,6 @@
|
||||
8255CEC20F16971600E53C11 /* plugin_string_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405EB0D92E3FF0006B936 /* plugin_string_stream.cc */; };
|
||||
8255CEE00F16972C00E53C11 /* plugin_stream_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8255CEDF0F16972C00E53C11 /* plugin_stream_posix.cc */; };
|
||||
82F14D610ED230E700B36428 /* webcursor_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82F14D600ED230E700B36428 /* webcursor_mac.mm */; };
|
||||
89F4A0B50F200C17000A326A /* CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A0AB0F1FAA69000A326A /* CanvasPixelArray.cpp */; };
|
||||
89F4A0D50F200D5B000A326A /* V8CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A0D30F200D59000A326A /* V8CanvasPixelArray.cpp */; };
|
||||
89F4A2090F2106EF000A326A /* V8CanvasPixelArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A1FC0F2101F8000A326A /* V8CanvasPixelArrayCustom.cpp */; };
|
||||
934CC0040EBFE0E000A658F2 /* chromium_bridge_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */; };
|
||||
@ -791,7 +794,6 @@
|
||||
938446D10F16B0570075F4C5 /* SVGNumberList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E98530D7F3EDB001ECF42 /* SVGNumberList.cpp */; };
|
||||
938446D20F16B0570075F4C5 /* SVGPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E98560D7F3EDB001ECF42 /* SVGPaint.cpp */; };
|
||||
938446D30F16B0570075F4C5 /* SVGPaintServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E974C0D7F3EDA001ECF42 /* SVGPaintServer.cpp */; };
|
||||
938446D40F16B0570075F4C5 /* SVGPaintServerCg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E96D10D7F3EDA001ECF42 /* SVGPaintServerCg.cpp */; };
|
||||
938446D50F16B0570075F4C5 /* SVGPaintServerGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E974E0D7F3EDA001ECF42 /* SVGPaintServerGradient.cpp */; };
|
||||
938446D60F16B0570075F4C5 /* SVGPaintServerLinearGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E97500D7F3EDA001ECF42 /* SVGPaintServerLinearGradient.cpp */; };
|
||||
938446D70F16B0570075F4C5 /* SVGPaintServerPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E97520D7F3EDA001ECF42 /* SVGPaintServerPattern.cpp */; };
|
||||
@ -1825,6 +1827,14 @@
|
||||
535EE0BF0EC4D10E00939D54 /* clipboard_conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = clipboard_conversion.h; sourceTree = "<group>"; };
|
||||
538D81990EC371EA00278C31 /* password_autocomplete_listener.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = password_autocomplete_listener.cc; sourceTree = "<group>"; };
|
||||
538D819A0EC371EA00278C31 /* password_autocomplete_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = password_autocomplete_listener.h; sourceTree = "<group>"; };
|
||||
53AAC36F0F291E8000233688 /* CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasPixelArray.cpp; sourceTree = "<group>"; };
|
||||
53AAC3710F291E9000233688 /* CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasPixelArray.h; sourceTree = "<group>"; };
|
||||
53AAC37C0F291F0F00233688 /* DocumentThreadableLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentThreadableLoader.cpp; sourceTree = "<group>"; };
|
||||
53AAC37E0F291F2900233688 /* DocumentThreadableLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentThreadableLoader.h; sourceTree = "<group>"; };
|
||||
53AAC37F0F291F4300233688 /* ThreadableLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadableLoader.cpp; sourceTree = "<group>"; };
|
||||
53AAC3810F291F5300233688 /* ThreadableLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoader.h; sourceTree = "<group>"; };
|
||||
53AAC3820F291F6300233688 /* ThreadableLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClient.h; sourceTree = "<group>"; };
|
||||
53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; };
|
||||
53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = "<group>"; };
|
||||
688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; };
|
||||
7B00912B0DAFEFBE00F72082 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
|
||||
@ -3436,7 +3446,6 @@
|
||||
7B5E96C00D7F3EDA001ECF42 /* ColorDistance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ColorDistance.cpp; path = ../ColorDistance.cpp; sourceTree = "<group>"; };
|
||||
7B5E96C10D7F3EDA001ECF42 /* ColorDistance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorDistance.h; path = ../ColorDistance.h; sourceTree = "<group>"; };
|
||||
7B5E96C20D7F3EDA001ECF42 /* GradientAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GradientAttributes.h; path = ../GradientAttributes.h; sourceTree = "<group>"; };
|
||||
7B5E96D10D7F3EDA001ECF42 /* SVGPaintServerCg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerCg.cpp; sourceTree = "<group>"; };
|
||||
7B5E96D60D7F3EDA001ECF42 /* SVGResourceFilterCg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceFilterCg.cpp; sourceTree = "<group>"; };
|
||||
7B5E96D70D7F3EDA001ECF42 /* SVGResourceFilterCg.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceFilterCg.mm; sourceTree = "<group>"; };
|
||||
7B5E96D80D7F3EDA001ECF42 /* SVGResourceMaskerCg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceMaskerCg.cpp; sourceTree = "<group>"; };
|
||||
@ -3995,11 +4004,9 @@
|
||||
82761F810E3FAC700030D324 /* AccessibilityObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityObject.cpp; sourceTree = "<group>"; };
|
||||
82761F820E3FAC700030D324 /* AccessibilityObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityObject.h; sourceTree = "<group>"; };
|
||||
82F14D600ED230E700B36428 /* webcursor_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = webcursor_mac.mm; sourceTree = "<group>"; };
|
||||
89F4A0AB0F1FAA69000A326A /* CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasPixelArray.cpp; sourceTree = "<group>"; };
|
||||
89F4A0D30F200D59000A326A /* V8CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CanvasPixelArray.cpp; sourceTree = "<group>"; };
|
||||
89F4A0D40F200D59000A326A /* V8CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8CanvasPixelArray.h; sourceTree = "<group>"; };
|
||||
89F4A1FC0F2101F8000A326A /* V8CanvasPixelArrayCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CanvasPixelArrayCustom.cpp; sourceTree = "<group>"; };
|
||||
89F5A4650F1ED04A0084BC85 /* CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasPixelArray.h; sourceTree = "<group>"; };
|
||||
934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chromium_bridge_impl.cc; sourceTree = "<group>"; };
|
||||
934CC2270EDCC37600A658F2 /* RGBColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColor.cpp; sourceTree = "<group>"; };
|
||||
934CC2290EDCC38400A658F2 /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
|
||||
@ -4574,8 +4581,6 @@
|
||||
7B0095D00DAFF0DC00F72082 /* v8 */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
89F4A0AB0F1FAA69000A326A /* CanvasPixelArray.cpp */,
|
||||
89F5A4650F1ED04A0084BC85 /* CanvasPixelArray.h */,
|
||||
7B0095D20DAFF0DC00F72082 /* dom_wrapper_map.h */,
|
||||
B5B0D4190EC8FE4900EA3314 /* JSDOMBinding.h */,
|
||||
B5B0D41A0EC8FE4900EA3314 /* JSDOMBinding.cpp */,
|
||||
@ -5259,6 +5264,8 @@
|
||||
7B5E8BE40D7F3B62001ECF42 /* CanvasGradient.h */,
|
||||
7B5E8BE60D7F3B62001ECF42 /* CanvasPattern.cpp */,
|
||||
7B5E8BE70D7F3B62001ECF42 /* CanvasPattern.h */,
|
||||
53AAC3710F291E9000233688 /* CanvasPixelArray.h */,
|
||||
53AAC36F0F291E8000233688 /* CanvasPixelArray.cpp */,
|
||||
7B5E8BEA0D7F3B62001ECF42 /* CanvasRenderingContext2D.cpp */,
|
||||
7B5E8BEB0D7F3B62001ECF42 /* CanvasRenderingContext2D.h */,
|
||||
7B5E8BED0D7F3B62001ECF42 /* CanvasStyle.cpp */,
|
||||
@ -5480,6 +5487,8 @@
|
||||
7B5E8DA70D7F3C01001ECF42 /* DocLoader.h */,
|
||||
7B5E8DA80D7F3C01001ECF42 /* DocumentLoader.cpp */,
|
||||
7B5E8DA90D7F3C01001ECF42 /* DocumentLoader.h */,
|
||||
53AAC37C0F291F0F00233688 /* DocumentThreadableLoader.cpp */,
|
||||
53AAC37E0F291F2900233688 /* DocumentThreadableLoader.h */,
|
||||
AB50EA1C0E9AB12B00FDD61B /* EmptyClients.h */,
|
||||
7B5E8DAA0D7F3C01001ECF42 /* FormState.cpp */,
|
||||
7B5E8DAB0D7F3C01001ECF42 /* FormState.h */,
|
||||
@ -5535,6 +5544,9 @@
|
||||
7B5E8DDF0D7F3C01001ECF42 /* TextDocument.h */,
|
||||
7B5E8DE00D7F3C01001ECF42 /* TextResourceDecoder.cpp */,
|
||||
7B5E8DE10D7F3C01001ECF42 /* TextResourceDecoder.h */,
|
||||
53AAC37F0F291F4300233688 /* ThreadableLoader.cpp */,
|
||||
53AAC3810F291F5300233688 /* ThreadableLoader.h */,
|
||||
53AAC3820F291F6300233688 /* ThreadableLoaderClient.h */,
|
||||
7B5E8DC90D7F3C01001ECF42 /* UserStyleSheetLoader.cpp */,
|
||||
7B5E8DCA0D7F3C01001ECF42 /* UserStyleSheetLoader.h */,
|
||||
);
|
||||
@ -5947,6 +5959,7 @@
|
||||
7B5E912D0D7F3CC2001ECF42 /* FormData.h */,
|
||||
040BA91E0F0077E800BFA8E5 /* FormDataBuilder.cpp */,
|
||||
040BA9200F0077EE00BFA8E5 /* FormDataBuilder.h */,
|
||||
53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */,
|
||||
7B5E912E0D7F3CC2001ECF42 /* HTTPHeaderMap.h */,
|
||||
7B5E912F0D7F3CC2001ECF42 /* HTTPParsers.cpp */,
|
||||
7B5E91300D7F3CC2001ECF42 /* HTTPParsers.h */,
|
||||
@ -6591,7 +6604,6 @@
|
||||
7B5E96CD0D7F3EDA001ECF42 /* cg */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
7B5E96D10D7F3EDA001ECF42 /* SVGPaintServerCg.cpp */,
|
||||
7B5E96D60D7F3EDA001ECF42 /* SVGResourceFilterCg.cpp */,
|
||||
7B5E96D70D7F3EDA001ECF42 /* SVGResourceFilterCg.mm */,
|
||||
7B5E96D80D7F3EDA001ECF42 /* SVGResourceMaskerCg.cpp */,
|
||||
@ -8185,7 +8197,6 @@
|
||||
9384478B0F16B06E0075F4C5 /* ScriptCallStack.cpp in Sources */,
|
||||
9384478C0F16B06E0075F4C5 /* ScriptCallStack.cpp in Sources */,
|
||||
9384478D0F16B06E0075F4C5 /* ScriptInstance.cpp in Sources */,
|
||||
89F4A0B50F200C17000A326A /* CanvasPixelArray.cpp in Sources */,
|
||||
9384478E0F16B06E0075F4C5 /* ScriptValue.cpp in Sources */,
|
||||
9384478F0F16B06E0075F4C5 /* SVGElementFactory.cpp in Sources */,
|
||||
938447900F16B06E0075F4C5 /* SVGNames.cpp in Sources */,
|
||||
@ -9204,7 +9215,6 @@
|
||||
938446D10F16B0570075F4C5 /* SVGNumberList.cpp in Sources */,
|
||||
938446D20F16B0570075F4C5 /* SVGPaint.cpp in Sources */,
|
||||
938446D30F16B0570075F4C5 /* SVGPaintServer.cpp in Sources */,
|
||||
938446D40F16B0570075F4C5 /* SVGPaintServerCg.cpp in Sources */,
|
||||
938446D50F16B0570075F4C5 /* SVGPaintServerGradient.cpp in Sources */,
|
||||
938446D60F16B0570075F4C5 /* SVGPaintServerLinearGradient.cpp in Sources */,
|
||||
938446D70F16B0570075F4C5 /* SVGPaintServerPattern.cpp in Sources */,
|
||||
@ -9383,6 +9393,10 @@
|
||||
93EF1C0E0F214F260070601B /* JPEGImageDecoder.cpp in Sources */,
|
||||
93EF1C0F0F214F260070601B /* PNGImageDecoder.cpp in Sources */,
|
||||
93EF1C100F214F260070601B /* XBMImageDecoder.cpp in Sources */,
|
||||
53AAC3700F291E8000233688 /* CanvasPixelArray.cpp in Sources */,
|
||||
53AAC37D0F291F0F00233688 /* DocumentThreadableLoader.cpp in Sources */,
|
||||
53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */,
|
||||
53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user