diff options
author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-08 19:50:29 +0000 |
---|---|---|
committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-08 19:50:29 +0000 |
commit | 16f5c4de8b926dc889859cfff03c9328edb60a5c (patch) | |
tree | c6d7a6f51973164ae28ff3157f0cf6356736c1d7 /o3d/utils | |
parent | c890e98205d97b57534f2eac00618a2864d61bb5 (diff) | |
download | chromium_src-16f5c4de8b926dc889859cfff03c9328edb60a5c.zip chromium_src-16f5c4de8b926dc889859cfff03c9328edb60a5c.tar.gz chromium_src-16f5c4de8b926dc889859cfff03c9328edb60a5c.tar.bz2 |
This CL adds client.toDataURL which gets the contents
of the client area as a data url (which is a base64
encoded string of a png file)
data urls are part of the HTML5 standard and supported
by firefox, safari and chrome.
http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#dom-canvas-todataurl
That means you can now do this
var dataURL = client.toDataURL();
// make an IMG tag display the screenshot
someImgTag.src = dataURL;
// use the IMG tag to draw into a canvas
someCanvasContext.drawImage(someImageTag, ...);
It also means there is no need for the test builds
anymore "test-dbg-d3d", "test-opt-d3d" etc as
toDataURL is part of the public API and can
therefore always be used to take screenshots
in any build.
I updated the selenium code to use it.
There are a few issues:
1) The GL version has the same limitations as taking
a screenshot before. Namely that the client area
must be on screen. We need to fix this.
2) We need to add support for origin-clean. See
https://tracker.corp.google.com/story/show/180334
Review URL: http://codereview.chromium.org/164130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/utils')
-rw-r--r-- | o3d/utils/build.scons | 2 | ||||
-rw-r--r-- | o3d/utils/cross/base64.cc | 90 | ||||
-rw-r--r-- | o3d/utils/cross/base64.h | 56 | ||||
-rw-r--r-- | o3d/utils/cross/base64_test.cc | 65 | ||||
-rw-r--r-- | o3d/utils/cross/dataurl.cc | 53 | ||||
-rw-r--r-- | o3d/utils/cross/dataurl.h | 52 | ||||
-rw-r--r-- | o3d/utils/cross/dataurl_test.cc | 56 | ||||
-rw-r--r-- | o3d/utils/utils.gyp | 6 |
8 files changed, 380 insertions, 0 deletions
diff --git a/o3d/utils/build.scons b/o3d/utils/build.scons index f06781e..0255261 100644 --- a/o3d/utils/build.scons +++ b/o3d/utils/build.scons @@ -31,6 +31,8 @@ Import('env') inputs = [ + 'cross/base64.cc', + 'cross/dataurl.cc', 'cross/file_path_utils.cc', 'cross/file_text_reader.cc', 'cross/file_text_writer.cc', diff --git a/o3d/utils/cross/base64.cc b/o3d/utils/cross/base64.cc new file mode 100644 index 0000000..3662258 --- /dev/null +++ b/o3d/utils/cross/base64.cc @@ -0,0 +1,90 @@ +/*
+ * Copyright 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.
+ */
+
+// This file contains the declaration of functions for dealing with base64
+// encoding and decoding
+
+#include "utils/cross/base64.h"
+#include "core/cross/types.h"
+
+namespace o3d {
+namespace base64 {
+
+size_t GetEncodeLength(size_t length) {
+ return (length + 2) / 3 * 4;
+}
+
+void Encode(const void* src_ptr, size_t length, void* dst_ptr) {
+ const int kEncodePad = 64;
+
+ static const char kEncode[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789+/=";
+
+ const uint8* src = reinterpret_cast<const uint8*>(src_ptr);
+ uint8* dst = reinterpret_cast<uint8*>(dst_ptr);
+ if (dst) {
+ size_t remainder = length % 3;
+ const uint8* end = &src[length - remainder];
+ while (src < end) {
+ unsigned a = *src++;
+ unsigned b = *src++;
+ unsigned c = *src++;
+ unsigned d = c & 0x3F;
+ c = (c >> 6 | b << 2) & 0x3F;
+ b = (b >> 4 | a << 4) & 0x3F;
+ a = a >> 2;
+ *dst++ = kEncode[a];
+ *dst++ = kEncode[b];
+ *dst++ = kEncode[c];
+ *dst++ = kEncode[d];
+ }
+ if (remainder > 0) {
+ unsigned k1 = 0;
+ unsigned k2 = kEncodePad;
+ unsigned a = *src++;
+ if (remainder == 2) {
+ int b = *src++;
+ k1 = b >> 4;
+ k2 = (b << 2) & 0x3F;
+ }
+ *dst++ = kEncode[a >> 2];
+ *dst++ = kEncode[(k1 | a << 4) & 0x3F];
+ *dst++ = kEncode[k2];
+ *dst++ = kEncode[kEncodePad];
+ }
+ }
+}
+
+} // namespace base64
+} // namespace o3d
+
diff --git a/o3d/utils/cross/base64.h b/o3d/utils/cross/base64.h new file mode 100644 index 0000000..881f988 --- /dev/null +++ b/o3d/utils/cross/base64.h @@ -0,0 +1,56 @@ +/*
+ * Copyright 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.
+ */
+
+// This file contains the declaration of functions for dealing with base64
+// encoding and decoding
+
+#ifndef O3D_UTILS_CROSS_BASE64_H_
+#define O3D_UTILS_CROSS_BASE64_H_
+
+namespace o3d {
+namespace base64 {
+
+// Returns the number of bytes needed to encode length bytes in base64.
+size_t GetEncodeLength(size_t length);
+
+// Encodes the src into base64 into the dst. The dst must have enough
+// space to hold the result.
+// Parameters:
+// src: pointer to source data.
+// length: the length of the source data
+// dst: pointer to place to store result.
+void Encode(const void* src, size_t length, void* dst);
+
+} // namespace base64
+} // namespace o3d
+
+#endif // O3D_UTILS_CROSS_BASE64_H_
+
diff --git a/o3d/utils/cross/base64_test.cc b/o3d/utils/cross/base64_test.cc new file mode 100644 index 0000000..205ce7b --- /dev/null +++ b/o3d/utils/cross/base64_test.cc @@ -0,0 +1,65 @@ +/*
+ * Copyright 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.
+ */
+
+
+// This file contains the tests of base64 functions
+
+#include "tests/common/win/testing_common.h"
+#include "utils/cross/base64.h"
+
+namespace o3d {
+
+class Base64Test : public testing::Test {
+};
+
+TEST_F(Base64Test, GetEncodeLength) {
+ EXPECT_EQ(0, base64::GetEncodeLength(0));
+ EXPECT_EQ(4, base64::GetEncodeLength(1));
+ EXPECT_EQ(4, base64::GetEncodeLength(2));
+ EXPECT_EQ(4, base64::GetEncodeLength(3));
+ EXPECT_EQ(8, base64::GetEncodeLength(4));
+}
+
+TEST_F(Base64Test, Encode) {
+ unsigned char buffer[100];
+ memset(buffer, 0xFF, sizeof(buffer));
+ base64::Encode("abc", 3, buffer);
+ EXPECT_EQ(0, memcmp(buffer, "YWJj", 4));
+ EXPECT_EQ(0xFF, buffer[4]);
+ memset(buffer, 0xFF, sizeof(buffer));
+ base64::Encode("ab\0c", 4, buffer);
+ EXPECT_EQ(0, memcmp(buffer, "YWIAYw==", 8));
+ EXPECT_EQ(0xFF, buffer[8]);
+}
+
+} // namespace o3d
+
+
diff --git a/o3d/utils/cross/dataurl.cc b/o3d/utils/cross/dataurl.cc new file mode 100644 index 0000000..8334b8d --- /dev/null +++ b/o3d/utils/cross/dataurl.cc @@ -0,0 +1,53 @@ +/*
+ * Copyright 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.
+ */
+
+// This file contains the definition of functions for dealing with data urls.
+
+#include "utils/cross/dataurl.h"
+#include "core/cross/types.h"
+#include "utils/cross/base64.h"
+
+namespace o3d {
+namespace dataurl {
+
+const char* const kEmptyDataURL = "data:,";
+
+String ToDataURL(const String& mime_type, const void* data, size_t length) {
+ String header(String("data:") + mime_type + ";base64,");
+ String result(header.size() + base64::GetEncodeLength(length), ' ');
+ result.replace(0, header.size(), header);
+ base64::Encode(data, length, &result[header.size()]);
+ return result;
+}
+
+} // namespace dataurl
+} // namespace o3d
+
diff --git a/o3d/utils/cross/dataurl.h b/o3d/utils/cross/dataurl.h new file mode 100644 index 0000000..cc46e01 --- /dev/null +++ b/o3d/utils/cross/dataurl.h @@ -0,0 +1,52 @@ +/*
+ * Copyright 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.
+ */
+
+// This file contains the declaration of functions for dealing with data urls.
+
+#ifndef O3D_UTILS_CROSS_DATAURL_H_
+#define O3D_UTILS_CROSS_DATAURL_H_
+
+#include "core/cross/types.h"
+
+namespace o3d {
+namespace dataurl {
+
+// An empty data URL. ("data:,")
+extern const char* const kEmptyDataURL;
+
+// Creates a data URL for the given data.
+String ToDataURL(const String& mime_type, const void* data, size_t length);
+
+} // namespace dataurl
+} // namespace o3d
+
+#endif // O3D_UTILS_CROSS_DATAURL_H_
+
diff --git a/o3d/utils/cross/dataurl_test.cc b/o3d/utils/cross/dataurl_test.cc new file mode 100644 index 0000000..8404650 --- /dev/null +++ b/o3d/utils/cross/dataurl_test.cc @@ -0,0 +1,56 @@ +/*
+ * Copyright 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.
+ */
+
+
+// This file contains the tests of dataurl functions
+
+#include "tests/common/win/testing_common.h"
+#include "utils/cross/dataurl.h"
+
+namespace o3d {
+
+class DataURLTest : public testing::Test {
+};
+
+TEST_F(DataURLTest, kEmptyDataURL) {
+ EXPECT_STREQ("data:,", dataurl::kEmptyDataURL);
+}
+
+TEST_F(DataURLTest, ToDataURL) {
+ EXPECT_STREQ("data:a/b;base64,YWJj",
+ dataurl::ToDataURL("a/b", "abc", 3).c_str());
+ EXPECT_STREQ("data:de/ej;base64,YWIAYw==",
+ dataurl::ToDataURL("de/ej", "ab\0c", 4).c_str());
+}
+
+} // namespace o3d
+
+
diff --git a/o3d/utils/utils.gyp b/o3d/utils/utils.gyp index 9fb5e45..14e3fa6 100644 --- a/o3d/utils/utils.gyp +++ b/o3d/utils/utils.gyp @@ -21,6 +21,10 @@ 'target_name': 'o3dUtils', 'type': 'static_library', 'sources': [ + "cross/base64.cc", + "cross/base64.h", + "cross/dataurl.cc", + "cross/dataurl.h", "cross/file_path_utils.cc", "cross/file_path_utils.h", "cross/file_text_reader.cc", @@ -50,6 +54,8 @@ ], 'direct_dependent_settings': { 'sources': [ + "cross/base64_test.cc", + "cross/dataurl_test.cc", "cross/file_path_utils_test.cc", "cross/file_text_reader_test.cc", "cross/json_writer_test.cc", |