sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 30.0.1599.66

Browse source 
Note that support for 10.0 is currently untested, WIP.
Submitted by:	George Liaskos
Security:	http://vuxml.org/freebsd/e5414d0c-2ade-11e3-821d-00262d5ed8ee.html
This commit is contained in:
Rene Ladan 2013-10-09 10:01:09 +00:00
parent d2562e58b7
commit ef6503643e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=329879
51 changed files with 474 additions and 732 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
www/chromium/Makefile
View file

@ -1,10 +1,11 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
#TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 29.0.1547.76
DISTVERSION= 30.0.1599.66
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
http://download.goodking.org/downloads/:browser \
@ -19,7 +20,7 @@ LICENSE= BSD LGPL21 MPL
LICENSE_COMB= multi
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
CFLAGS+= -fno-stack-protector
CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
bash:${PORTSDIR}/shells/bash \
@ -139,9 +140,9 @@ CXX= clang++
.endif
GYP_DEFINES+= clang=1
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
.if ${OSVERSION} >= 1000054
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++
.endif
#.if ${OSVERSION} >= 1000054
#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++
#.endif
.endif
.if ${PORT_OPTIONS:MTEST}
@ -155,7 +156,7 @@ TEST_TARGETS= base_unittests \
sql_unittests \
net_unittests \
content_unittests
EXCLUDED_TESTS=
EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation
NINJA_TARGETS+= ${TEST_TARGETS}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser \
${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
@ -202,7 +203,7 @@ post-patch:
${WRKSRC}/third_party/libvpx/libvpx.gyp \
${WRKSRC}/crypto/crypto.gyp \
${WRKSRC}/v8/tools/gyp/v8.gyp \
${WRKSRC}/v8/build/common.gypi
${WRKSRC}/v8/build/toolchain.gypi
@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
${WRKSRC}/third_party/WebKit/Source/core/core.gypi
@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \

8
www/chromium/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (chromium-courgette-redacted-29.0.1547.76.tar.xz) = f2981bc31c485cad0e8ff2a540a74dd75fa1ec5e7a5357ef19b5c4d662d9f442
SIZE (chromium-courgette-redacted-29.0.1547.76.tar.xz) = 173600568
SHA256 (chromium-29.0.1547.76-testdata.tar.xz) = 408c13b3b2d56725c8569280710c07340cce463c9de44677211ea4fa566b4591
SIZE (chromium-29.0.1547.76-testdata.tar.xz) = 108867432
SHA256 (chromium-courgette-redacted-30.0.1599.66.tar.xz) = 473f3b0914e8ab4bea022b0e2b55eab1df43cebfef0d0c1d6f9aea2c2f2eadce
SIZE (chromium-courgette-redacted-30.0.1599.66.tar.xz) = 167634408
SHA256 (chromium-30.0.1599.66-testdata.tar.xz) = eca21bed4df5f0df5e75cccc8f057c54754dde88027cbe25cec21a31010102d6
SIZE (chromium-30.0.1599.66-testdata.tar.xz) = 108833456

21
www/chromium/files/extra-patch-clang
View file

@ -233,24 +233,3 @@
CMapFormat::kFormat4, cmap_id) {
}
--- v8/src/heap.cc.orig 2013-08-30 22:09:43.000000000 +0300
+++ v8/src/heap.cc 2013-08-30 22:10:26.000000000 +0300
@@ -7285,7 +7285,7 @@
#ifdef DEBUG
-Object* const PathTracer::kAnyGlobalObject = reinterpret_cast<Object*>(NULL);
+Object* const PathTracer::kAnyGlobalObject = static_cast<Object*>(NULL);
class PathTracer::MarkVisitor: public ObjectVisitor {
public:
--- v8/src/stub-cache.cc 2013-07-03 23:56:49.000000000 -0400
+++ v8/src/stub-cache.cc 2013-07-19 00:35:10.000000000 -0400
@@ -1476,7 +1476,7 @@
Handle<Name> name) {
return (FLAG_print_code_stubs && !name.is_null() && name->IsString())
? GetCodeWithFlags(flags, *Handle<String>::cast(name)->ToCString())
- : GetCodeWithFlags(flags, reinterpret_cast<char*>(NULL));
+ : GetCodeWithFlags(flags, static_cast<char*>(NULL));
}

23
www/chromium/files/extra-patch-gcc
View file

@ -28,3 +28,26 @@
#include <string>
#include "base/gtest_prod_util.h"
--- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200
+++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200
@@ -38,6 +38,10 @@
#include "talk/base/messagehandler.h"
#include "talk/base/sigslot.h"
+#if defined(OS_FREEBSD)
+#include <sys/types.h>
+#endif
+
#if defined(POSIX)
struct ifaddrs;
#endif // defined(POSIX)
--- base/sys_info_freebsd.cc.orig 2013-05-17 22:44:42.000000000 +0200
+++ base/sys_info_freebsd.cc 2013-05-26 22:57:45.885322785 +0200
@@ -4,6 +4,7 @@
#include "base/sys_info.h"
+#include <sys/types.h>
#include <sys/sysctl.h>
#include "base/logging.h"

314
www/chromium/files/extra-patch-libc++
View file

@ -1,314 +0,0 @@
--- AUTHORS.orig 2013-09-03 03:10:29.000000000 -0400
+++ AUTHORS 2013-09-13 13:21:24.000000000 -0400
@@ -268,3 +268,4 @@
Jingwei Liu <kingweiliu@gmail.com>
Zheng Chuang <zhengchuangscu@gmail.com>
Kevin M. McCormick <mckev@amazon.com>
+Zeno Albisser <zeno.albisser@digia.com>
--- content/browser/renderer_host/pepper/browser_ppapi_host_impl.h.orig 2013-09-03 03:09:02.000000000 -0400
+++ content/browser/renderer_host/pepper/browser_ppapi_host_impl.h 2013-09-12 18:01:57.000000000 -0400
@@ -13,6 +13,7 @@
#include "base/files/file_path.h"
#include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
#include "content/common/content_export.h"
+#include "content/common/pepper_renderer_instance_data.h"
#include "content/public/browser/browser_ppapi_host.h"
#include "content/public/common/process_type.h"
#include "ipc/ipc_channel_proxy.h"
@@ -20,8 +21,6 @@
namespace content {
-struct PepperRendererInstanceData;
-
class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost {
public:
// The creator is responsible for calling set_plugin_process_handle as soon
--- content/browser/in_process_webkit/indexed_db_dispatcher_host.h.orig 2013-09-03 03:09:01.000000000 -0400
+++ content/browser/in_process_webkit/indexed_db_dispatcher_host.h 2013-09-12 18:03:26.000000000 -0400
@@ -11,8 +11,8 @@
#include "base/basictypes.h"
#include "base/id_map.h"
#include "content/public/browser/browser_message_filter.h"
+#include "url/gurl.h"
-class GURL;
struct IndexedDBDatabaseMetadata;
struct IndexedDBHostMsg_DatabaseCount_Params;
struct IndexedDBHostMsg_DatabaseCreateIndex_Params;
--- content/public/test/test_file_error_injector.h.orig 2013-09-03 03:08:59.000000000 -0400
+++ content/public/test/test_file_error_injector.h 2013-09-12 18:02:11.000000000 -0400
@@ -13,8 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/ref_counted.h"
#include "content/public/browser/download_interrupt_reasons.h"
-
-class GURL;
+#include "url/gurl.h"
namespace content {
--- content/renderer/media/media_stream_center.h.orig 2013-09-03 03:08:58.000000000 -0400
+++ content/renderer/media/media_stream_center.h 2013-09-12 18:02:11.000000000 -0400
@@ -11,6 +11,7 @@
#include "third_party/WebKit/public/platform/WebMediaStream.h"
#include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
+#include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h"
namespace WebKit {
class WebMediaStreamCenterClient;
--- net/http/http_auth_cache.h.orig 2013-09-03 03:10:07.000000000 -0400
+++ net/http/http_auth_cache.h 2013-09-12 18:02:08.000000000 -0400
@@ -26,7 +26,77 @@
// Entries can be looked up by either (origin, realm, scheme) or (origin, path).
class NET_EXPORT_PRIVATE HttpAuthCache {
public:
- class Entry;
+ class NET_EXPORT_PRIVATE Entry {
+ public:
+ ~Entry();
+
+ const GURL& origin() const {
+ return origin_;
+ }
+
+ // The case-sensitive realm string of the challenge.
+ const std::string realm() const {
+ return realm_;
+ }
+
+ // The authentication scheme of the challenge.
+ HttpAuth::Scheme scheme() const {
+ return scheme_;
+ }
+
+ // The authentication challenge.
+ const std::string auth_challenge() const {
+ return auth_challenge_;
+ }
+
+ // The login credentials.
+ const AuthCredentials& credentials() const {
+ return credentials_;
+ }
+
+ int IncrementNonceCount() {
+ return ++nonce_count_;
+ }
+
+ void UpdateStaleChallenge(const std::string& auth_challenge);
+
+ private:
+ friend class HttpAuthCache;
+ FRIEND_TEST_ALL_PREFIXES(HttpAuthCacheTest, AddPath);
+ FRIEND_TEST_ALL_PREFIXES(HttpAuthCacheTest, AddToExistingEntry);
+
+ typedef std::list<std::string> PathList;
+
+ Entry();
+
+ // Adds a path defining the realm's protection space. If the path is
+ // already contained in the protection space, is a no-op.
+ void AddPath(const std::string& path);
+
+ // Returns true if |dir| is contained within the realm's protection
+ // space. |*path_len| is set to the length of the enclosing path if
+ // such a path exists and |path_len| is non-NULL. If no enclosing
+ // path is found, |*path_len| is left unmodified.
+ //
+ // Note that proxy auth cache entries are associated with empty
+ // paths. Therefore it is possible for HasEnclosingPath() to return
+ // true and set |*path_len| to 0.
+ bool HasEnclosingPath(const std::string& dir, size_t* path_len);
+
+ // |origin_| contains the {protocol, host, port} of the server.
+ GURL origin_;
+ std::string realm_;
+ HttpAuth::Scheme scheme_;
+
+ // Identity.
+ std::string auth_challenge_;
+ AuthCredentials credentials_;
+
+ int nonce_count_;
+
+ // List of paths that define the realm's protection space.
+ PathList paths_;
+ };
// Prevent unbounded memory growth. These are safeguards for abuse; it is
// not expected that the limits will be reached in ordinary usage.
@@ -106,78 +176,6 @@
};
// An authentication realm entry.
-class NET_EXPORT_PRIVATE HttpAuthCache::Entry {
- public:
- ~Entry();
-
- const GURL& origin() const {
- return origin_;
- }
-
- // The case-sensitive realm string of the challenge.
- const std::string realm() const {
- return realm_;
- }
-
- // The authentication scheme of the challenge.
- HttpAuth::Scheme scheme() const {
- return scheme_;
- }
-
- // The authentication challenge.
- const std::string auth_challenge() const {
- return auth_challenge_;
- }
-
- // The login credentials.
- const AuthCredentials& credentials() const {
- return credentials_;
- }
-
- int IncrementNonceCount() {
- return ++nonce_count_;
- }
-
- void UpdateStaleChallenge(const std::string& auth_challenge);
-
- private:
- friend class HttpAuthCache;
- FRIEND_TEST_ALL_PREFIXES(HttpAuthCacheTest, AddPath);
- FRIEND_TEST_ALL_PREFIXES(HttpAuthCacheTest, AddToExistingEntry);
-
- typedef std::list<std::string> PathList;
-
- Entry();
-
- // Adds a path defining the realm's protection space. If the path is
- // already contained in the protection space, is a no-op.
- void AddPath(const std::string& path);
-
- // Returns true if |dir| is contained within the realm's protection
- // space. |*path_len| is set to the length of the enclosing path if
- // such a path exists and |path_len| is non-NULL. If no enclosing
- // path is found, |*path_len| is left unmodified.
- //
- // Note that proxy auth cache entries are associated with empty
- // paths. Therefore it is possible for HasEnclosingPath() to return
- // true and set |*path_len| to 0.
- bool HasEnclosingPath(const std::string& dir, size_t* path_len);
-
- // |origin_| contains the {protocol, host, port} of the server.
- GURL origin_;
- std::string realm_;
- HttpAuth::Scheme scheme_;
-
- // Identity.
- std::string auth_challenge_;
- AuthCredentials credentials_;
-
- int nonce_count_;
-
- // List of paths that define the realm's protection space.
- PathList paths_;
-};
-
} // namespace net
#endif // NET_HTTP_HTTP_AUTH_CACHE_H_
--- ui/gfx/image/image_family.h.orig 2013-09-03 03:09:09.000000000 -0400
+++ ui/gfx/image/image_family.h 2013-09-12 18:02:08.000000000 -0400
@@ -27,8 +27,16 @@
// include high-DPI representations).
class UI_EXPORT ImageFamily {
private:
- // Forward declaration.
- struct MapKey;
+ // An <aspect ratio, DIP width> pair.
+ // A 0x0 image has aspect ratio 1.0. 0xN and Nx0 images are treated as 0x0.
+ struct MapKey : std::pair<float, int> {
+ MapKey(float aspect, int width)
+ : std::pair<float, int>(aspect, width) {}
+
+ float aspect() const { return first; }
+
+ int width() const { return second; }
+ };
public:
// Type for iterating over all images in the family, in order.
@@ -127,17 +135,6 @@
const gfx::Image* GetBest(const gfx::Size& size) const;
private:
- // An <aspect ratio, DIP width> pair.
- // A 0x0 image has aspect ratio 1.0. 0xN and Nx0 images are treated as 0x0.
- struct MapKey : std::pair<float, int> {
- MapKey(float aspect, int width)
- : std::pair<float, int>(aspect, width) {}
-
- float aspect() const { return first; }
-
- int width() const { return second; }
- };
-
// Find the closest aspect ratio in the map to |desired_aspect|.
// Ties are broken by the thinner aspect.
// |map_| must not be empty. |desired_aspect| must be > 0.0.
--- webkit/browser/dom_storage/dom_storage_namespace.h.orig 2013-09-03 03:10:02.000000000 -0400
+++ webkit/browser/dom_storage/dom_storage_namespace.h 2013-09-12 18:05:35.000000000 -0400
@@ -11,8 +11,7 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "webkit/browser/webkit_storage_browser_export.h"
-
-class GURL;
+#include "url/gurl.h"
namespace dom_storage {
--- webkit/support/weburl_loader_mock_factory.cc.orig 2013-09-03 03:10:02.000000000 -0400
+++ webkit/support/weburl_loader_mock_factory.cc 2013-09-12 18:02:11.000000000 -0400
@@ -23,11 +23,6 @@
using WebKit::WebURLRequest;
using WebKit::WebURLResponse;
-struct WebURLLoaderMockFactory::ResponseInfo {
- WebKit::WebURLResponse response;
- base::FilePath file_path;
-};
-
WebURLLoaderMockFactory::WebURLLoaderMockFactory() {}
WebURLLoaderMockFactory::~WebURLLoaderMockFactory() {}
--- webkit/support/weburl_loader_mock_factory.h.orig 2013-09-03 03:10:02.000000000 -0400
+++ webkit/support/weburl_loader_mock_factory.h 2013-09-12 18:02:11.000000000 -0400
@@ -9,12 +9,12 @@
#include "base/files/file_path.h"
#include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
namespace WebKit {
class WebData;
-struct WebURLError;
class WebURLLoader;
}
@@ -75,7 +75,11 @@
void CancelLoad(WebURLLoaderMock* loader);
private:
- struct ResponseInfo;
+ struct ResponseInfo {
+ WebKit::WebURLResponse response;
+ base::FilePath file_path;
+ };
+
// Loads the specified request and populates the response, error and data
// accordingly.

14
www/chromium/files/patch-base__base.gyp Normal file
View file

@ -0,0 +1,14 @@
--- base/base.gyp.orig 2013-09-26 02:17:34.000000000 +0300
+++ base/base.gyp 2013-09-26 03:00:53.000000000 +0300
@@ -823,6 +823,11 @@
['include', '^debug/proc_maps_linux_unittest\\.cc$'],
],
}],
+ ['<(os_bsd) == 1', {
+ 'sources/': [
+ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'],
+ ],
+ }],
], # target_conditions
},
{

17
www/chromium/files/patch-base__base.gypi
View file

@ -1,8 +1,15 @@
--- base/base.gypi.orig 2013-08-09 22:05:55.000000000 +0300
+++ base/base.gypi 2013-08-17 20:58:50.000000000 +0300
@@ -838,6 +838,8 @@
['exclude', '^process_linux\\.cc$'],
['exclude', '^process_util_linux\\.cc$'],
--- base/base.gypi.orig 2013-09-28 20:09:58.000000000 +0300
+++ base/base.gypi 2013-09-26 02:24:27.000000000 +0300
@@ -872,11 +872,15 @@
'process/memory_stubs.cc',
],
'sources/': [
+ ['exclude', '^debug/proc_maps_linux\\.cc$'],
['exclude', '^files/file_path_watcher_linux\\.cc$'],
['exclude', '^files/file_path_watcher_stub\\.cc$'],
['exclude', '^file_util_linux\\.cc$'],
+ ['exclude', '^process/memory_linux\\.cc$'],
['exclude', '^process/process_linux\\.cc$'],
['exclude', '^sys_info_linux\\.cc$'],
+ ['exclude', '^process/process_iterator_linux\\.cc$'],
+ ['exclude', '^process/process_metrics_linux\\.cc$'],

14
www/chromium/files/patch-base__process_util_unittest.cc → www/chromium/files/patch-base__process__memory_unittest.cc
View file

@ -1,6 +1,12 @@
--- base/process_util_unittest.cc.orig 2013-08-31 13:38:46.000000000 +0300
+++ base/process_util_unittest.cc 2013-08-31 13:40:13.000000000 +0300
@@ -1086,7 +1086,7 @@
--- base/process/memory_unittest.cc.orig 2013-09-24 23:49:53.000000000 +0300
+++ base/process/memory_unittest.cc 2013-09-24 23:50:57.000000000 +0300
@@ -153,12 +153,12 @@
// Android doesn't implement set_new_handler, so we can't use the
// OutOfMemoryTest cases.
-// OpenBSD does not support these tests either.
+// OpenBSD and FreeBSD does not support these tests either.
// AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc.
// functions so that they don't crash if the program is out of memory, so the
// OOM tests aren't supposed to work.
// TODO(vandebo) make this work on Windows too.
@ -9,7 +15,7 @@
!defined(OS_WIN) && \
!defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
@@ -1303,5 +1303,5 @@
@@ -375,5 +375,5 @@
#endif // !ARCH_CPU_64_BITS
#endif // OS_MACOSX

22
www/chromium/files/patch-base__process_util_freebsd.cc → www/chromium/files/patch-base__process__process_handle_freebsd.cc
View file

@ -1,15 +1,15 @@
--- base/process_util_freebsd.cc.orig 2013-08-19 02:53:01.000000000 +0300
+++ base/process_util_freebsd.cc 2013-08-31 13:54:23.000000000 +0300
@@ -18,7 +18,7 @@
#include <unistd.h>
--- base/process/process_handle_freebsd.cc.orig 2013-09-20 05:35:17.000000000 +0300
+++ base/process/process_handle_freebsd.cc 2013-09-24 20:41:45.000000000 +0300
@@ -6,33 +6,35 @@
#include "base/logging.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -28,27 +28,27 @@
#include <sys/sysctl.h>
#include <sys/types.h>
-#include <unistd.h>
+#include <sys/user.h>
+
+#include "base/logging.h"
namespace base {
ProcessId GetParentProcessId(ProcessHandle process) {
struct kinfo_proc info;

16
www/chromium/files/patch-base__sys_info_freebsd.cc
View file

@ -1,14 +1,6 @@
--- base/sys_info_freebsd.cc.orig 2013-09-03 03:09:04.000000000 -0400
+++ base/sys_info_freebsd.cc 2013-09-12 14:46:12.000000000 -0400
@@ -4,6 +4,7 @@
#include "base/sys_info.h"
+#include <sys/types.h>
#include <sys/sysctl.h>
#include "base/logging.h"
@@ -23,6 +24,19 @@
--- base/sys_info_freebsd.cc.orig 2012-11-27 10:01:52.000000000 +0200
+++ base/sys_info_freebsd.cc 2012-12-09 18:04:30.000000000 +0200
@@ -23,6 +23,19 @@
}
// static
@ -28,7 +20,7 @@
size_t SysInfo::MaxSharedMemorySize() {
size_t limit;
size_t size = sizeof(limit);
@@ -33,4 +47,25 @@
@@ -33,4 +46,25 @@
return limit;
}

16
www/chromium/files/patch-build__linux__python_arch.sh
View file

@ -1,16 +0,0 @@
--- build/linux/python_arch.sh.orig 2011-06-08 21:00:57.020677627 +0300
+++ build/linux/python_arch.sh 2011-06-08 21:01:35.203676025 +0300
@@ -10,12 +10,7 @@
# python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0
#
-python=$(readlink -f "$1")
-if [ ! -r "$python" ]; then
- echo unknown
- exit 0
-fi
-file_out=$(file "$python")
+file_out=$(file "$1")
if [ $? -ne 0 ]; then
echo unknown
exit 0

51
www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
View file

@ -1,6 +1,24 @@
--- chrome/app/chrome_main_delegate.cc.orig 2012-12-04 23:34:32.000000000 +0200
+++ chrome/app/chrome_main_delegate.cc 2012-12-04 23:35:37.000000000 +0200
@@ -264,7 +264,7 @@
--- chrome/app/chrome_main_delegate.cc.orig 2013-09-20 05:35:27.000000000 +0300
+++ chrome/app/chrome_main_delegate.cc 2013-09-25 21:42:44.000000000 +0300
@@ -92,7 +92,7 @@
#include "ui/base/x/x11_util.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include "chrome/app/breakpad_linux.h"
#endif
@@ -110,7 +110,7 @@
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
#endif
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_BSD)
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
#endif
@@ -230,7 +230,7 @@
// Mac needs them for the plugin process name.
process_type == switches::kPluginProcess ||
#endif
@ -9,3 +27,30 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -573,7 +573,7 @@
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_BSD)
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
#endif
@@ -699,7 +699,7 @@
#endif
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain
// sets this up for the browser process in a different manner. Zygotes
// need to call InitCrashReporter() in RunZygote().
@@ -811,7 +811,7 @@
SetUpProfilingShutdownHandler();
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner.
InitCrashReporter();

29
www/chromium/files/patch-chrome__app__policy__policy_templates.json Normal file
View file

@ -0,0 +1,29 @@
--- chrome/app/policy/policy_templates.json.orig 2013-09-24 21:57:03.000000000 +0300
+++ chrome/app/policy/policy_templates.json 2013-09-24 21:59:32.000000000 +0300
@@ -1365,7 +1365,7 @@
'name': 'GSSAPILibraryName',
'type': 'string',
'schema': { 'type': 'string' },
- 'supported_on': ['chrome.linux:9-'],
+ 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
'features': {
'dynamic_refresh': False,
'per_profile': False,
@@ -3251,7 +3251,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main',
'schema': { 'type': 'boolean' },
- 'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.win:30-'],
+ 'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
'features': {
'dynamic_refresh': True,
'per_profile': False,
@@ -3766,7 +3766,7 @@
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },
- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
+ 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,

11
www/chromium/files/patch-chrome__browser__browser_about_handler.cc
View file

@ -1,11 +0,0 @@
--- chrome/browser/browser_about_handler.cc.orig 2012-01-18 11:12:44.000000000 +0200
+++ chrome/browser/browser_about_handler.cc 2012-01-29 15:07:44.000000000 +0200
@@ -63,7 +63,7 @@
#if defined(OS_WIN)
chrome::kChromeUIConflictsHost,
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
chrome::kChromeUILinuxProxyConfigHost,
chrome::kChromeUISandboxHost,
#endif

38
www/chromium/files/patch-chrome__browser__browser_process_impl.cc Normal file
View file

@ -0,0 +1,38 @@
--- chrome/browser/browser_process_impl.cc.orig 2013-09-25 23:32:28.000000000 +0300
+++ chrome/browser/browser_process_impl.cc 2013-09-25 23:34:24.000000000 +0300
@@ -244,7 +244,7 @@
ExtensionRendererState::GetInstance()->Shutdown();
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
media_file_system_registry_.reset();
// Delete |storage_monitor_| now. Otherwise the FILE thread would be gone
// when we try to release it in the dtor and Valgrind would report a
@@ -618,7 +618,7 @@
}
chrome::StorageMonitor* BrowserProcessImpl::storage_monitor() {
-#if defined(OS_ANDROID) || defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD)
return NULL;
#else
return storage_monitor_.get();
@@ -627,7 +627,7 @@
void BrowserProcessImpl::set_storage_monitor_for_test(
scoped_ptr<chrome::StorageMonitor> monitor) {
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
storage_monitor_ = monitor.Pass();
#endif
}
@@ -923,7 +923,7 @@
}
#endif
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
storage_monitor_.reset(chrome::StorageMonitor::Create());
#endif

57
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
View file

@ -1,11 +1,56 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2012-05-30 10:01:59.000000000 +0300
+++ chrome/browser/chrome_content_browser_client.cc 2012-06-05 21:38:09.000000000 +0300
@@ -132,7 +132,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
--- chrome/browser/chrome_content_browser_client.cc.orig 2013-09-25 22:01:36.000000000 +0300
+++ chrome/browser/chrome_content_browser_client.cc 2013-09-25 22:11:33.000000000 +0300
@@ -166,7 +166,7 @@
#include "chrome/browser/chrome_browser_main_posix.h"
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID)
#include "base/linux_util.h"
#include "chrome/browser/crash_handler_host_linuxish.h"
#include "chrome/browser/crash_handler_host_linux.h"
#endif
@@ -480,7 +480,7 @@
}
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
int GetCrashSignalFD(const CommandLine& command_line) {
if (command_line.HasSwitch(switches::kExtensionProcess)) {
ExtensionCrashHandlerHostLinux* crash_handler =
@@ -505,7 +505,7 @@
return -1;
}
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#if !defined(OS_CHROMEOS)
GURL GetEffectiveURLForSignin(const GURL& url) {
@@ -1346,7 +1346,7 @@
command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
child_process_logging::GetClientId());
}
-#elif defined(OS_POSIX)
+#elif defined(OS_POSIX) && !defined(OS_BSD)
if (IsCrashReporterEnabled()) {
command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
@@ -2461,7 +2461,7 @@
additional_backends->push_back(new sync_file_system::SyncFileSystemBackend());
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const CommandLine& command_line,
int child_process_id,
@@ -2521,7 +2521,7 @@
}
#endif // defined(OS_ANDROID)
}
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#if defined(OS_WIN)
const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {

11
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2013-09-25 22:20:01.000000000 +0300
+++ chrome/browser/chrome_content_browser_client.h 2013-09-25 22:20:17.000000000 +0300
@@ -248,7 +248,7 @@
const base::FilePath& storage_partition_path,
ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
virtual void GetAdditionalMappedFilesForChildProcess(
const CommandLine& command_line,
int child_process_id,

4
www/chromium/files/patch-chrome__common__chrome_notification_types.h → www/chromium/files/patch-chrome__browser__chrome_notification_types.h
View file

@ -1,5 +1,5 @@
--- chrome/common/chrome_notification_types.h.orig 2012-07-25 23:17:58.000000000 +0300
+++ chrome/common/chrome_notification_types.h 2012-07-25 23:18:37.000000000 +0300
--- chrome/browser/chrome_notification_types.h.orig 2012-07-25 23:17:58.000000000 +0300
+++ chrome/browser/chrome_notification_types.h 2012-07-25 23:18:37.000000000 +0300
@@ -54,13 +54,13 @@
// that was closed, no details are expected.
NOTIFICATION_WINDOW_CLOSED,

42
www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__storage_info_provider_bsd.cc
View file

@ -1,42 +0,0 @@
--- /dev/null 2013-05-08 01:24:05.000000000 +0300
+++ chrome/browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc 2013-05-08 01:20:01.000000000 +0300
@@ -0,0 +1,39 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
+
+namespace extensions {
+
+namespace {
+
+using api::experimental_system_info_storage::StorageUnitInfo;
+
+class StorageInfoProviderBSD : public StorageInfoProvider {
+ public:
+ StorageInfoProviderBSD() {}
+
+ virtual bool QueryInfo(StorageInfo* info) OVERRIDE {
+ NOTIMPLEMENTED();
+ return false;
+ }
+ virtual bool QueryUnitInfo(const std::string& id,
+ StorageUnitInfo* info) OVERRIDE {
+ NOTIMPLEMENTED();
+ return false;
+ }
+
+ private:
+ virtual ~StorageInfoProviderBSD() {}
+};
+
+} //
+
+// static
+StorageInfoProvider* StorageInfoProvider::Get() {
+ return StorageInfoProvider::GetInstance<StorageInfoProviderBSD>();
+}
+
+} // namespace extensions
+

18
www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc
View file

@ -1,18 +0,0 @@
--- chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc.orig 2013-02-13 23:14:07.000000000 +0200
+++ chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc 2013-02-13 23:14:56.000000000 +0200
@@ -14,10 +14,14 @@
}
bool SystemInfoStorageGetFunction::RunImpl() {
+#if defined(OS_BSD)
+ return false;
+#else
StorageInfoProvider::Get()->StartQueryInfo(
base::Bind(&SystemInfoStorageGetFunction::OnGetStorageInfoCompleted,
this));
return true;
+#endif
}
void SystemInfoStorageGetFunction::OnGetStorageInfoCompleted(

11
www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
View file

@ -1,11 +0,0 @@
--- chrome/browser/ui/gtk/accelerators_gtk.h.orig 2013-09-13 13:12:50.000000000 -0400
+++ chrome/browser/ui/gtk/accelerators_gtk.h 2013-09-13 13:13:09.000000000 -0400
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_UI_GTK_ACCELERATORS_GTK_H_
#define CHROME_BROWSER_UI_GTK_ACCELERATORS_GTK_H_
+#include <vector>
+
#include "base/containers/hash_tables.h"
#include "ui/base/accelerators/accelerator.h"

20
www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/ui/gtk/first_run_dialog.cc.orig 2013-09-25 23:01:19.000000000 +0300
+++ chrome/browser/ui/gtk/first_run_dialog.cc 2013-09-25 23:11:03.000000000 +0300
@@ -160,6 +160,7 @@
if (dialog_)
gtk_widget_hide_all(dialog_);
+#if !defined(OS_BSD)
// Check if user has opted into reporting.
if (report_crashes_ &&
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) {
@@ -168,6 +169,9 @@
} else {
GoogleUpdateSettings::SetCollectStatsConsent(false);
}
+#else
+ GoogleUpdateSettings::SetCollectStatsConsent(false);
+#endif
// If selected set as default browser.
if (make_default_ &&

30
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
View file

@ -1,38 +1,42 @@
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-23 16:36:11.000000000 +0300
+++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-08-23 16:38:28.000000000 +0300
@@ -337,7 +337,7 @@
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-30 06:46:19.000000000 +0300
+++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-09-03 21:15:44.092633766 +0300
@@ -338,7 +338,8 @@
{ "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "translateEnableTranslate",
IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON },
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC },
@@ -583,7 +583,7 @@
"themesReset",
base::Bind(&BrowserOptionsHandler::ThemesReset,
@@ -596,7 +597,8 @@
"requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
@@ -1327,7 +1327,7 @@
@@ -1323,7 +1325,8 @@
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_native_theme = false;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
bool profile_is_managed = profile->IsManaged();
is_native_theme = theme_service->UsingNativeTheme();
base::FundamentalValue native_theme_enabled(!is_native_theme &&
!profile_is_managed);
@@ -1350,7 +1350,7 @@
@@ -1345,7 +1348,8 @@
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) {
content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
Profile* profile = Profile::FromWebUI(web_ui());

9
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
View file

@ -1,11 +1,12 @@
--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-08-23 16:36:30.000000000 +0300
+++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-08-23 16:54:38.000000000 +0300
@@ -194,7 +194,7 @@
--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-09-03 21:22:36.851628387 +0300
+++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-09-03 21:23:09.395628553 +0300
@@ -193,7 +193,8 @@
void ObserveThemeChanged();
void ThemesReset(const base::ListValue* args);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
void ThemesSetNative(const base::ListValue* args);
#endif

12
www/chromium/files/patch-chrome__browser__usb__usb_context.cc Normal file
View file

@ -0,0 +1,12 @@
--- chrome/browser/usb/usb_context.cc.orig 2013-10-08 21:07:13.000000000 +0300
+++ chrome/browser/usb/usb_context.cc 2013-10-08 22:04:50.000000000 +0300
@@ -44,7 +44,9 @@
running_ = false;
// Spreading running_ to the UsbEventHandler thread.
base::subtle::MemoryBarrier();
+#if !defined(OS_FREEBSD)
libusb_interrupt_handle_event(context_);
+#endif
base::PlatformThread::Join(thread_handle_);
}

26
www/chromium/files/patch-chrome__chrome_browser.gypi
View file

@ -1,15 +1,6 @@
--- chrome/chrome_browser.gypi.orig 2013-08-09 22:06:42.000000000 +0300
+++ chrome/chrome_browser.gypi 2013-08-17 22:05:42.000000000 +0300
@@ -2456,7 +2456,7 @@
'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
},
}],
- ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1', {
+ ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1 or os_bsd==1', {
'sources': [
'browser/media_galleries/fileapi/device_media_async_file_util.cc',
'browser/media_galleries/fileapi/device_media_async_file_util.h',
@@ -2640,7 +2640,7 @@
--- chrome/chrome_browser.gypi.orig 2013-09-20 05:36:07.000000000 +0300
+++ chrome/chrome_browser.gypi 2013-09-23 20:34:16.000000000 +0300
@@ -2735,7 +2735,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@ -18,7 +9,16 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
@@ -2996,6 +2996,25 @@
@@ -2859,7 +2859,7 @@
],
},
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
'sources': [
'app/breakpad_linux.cc',
'app/breakpad_linux.h',
@@ -3104,6 +3104,25 @@
['exclude', '^browser/usb/'],
],
}],

25
www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
View file

@ -1,25 +0,0 @@
--- chrome/chrome_browser_extensions.gypi.orig 2013-05-08 00:59:31.000000000 +0300
+++ chrome/chrome_browser_extensions.gypi 2013-05-08 01:23:36.000000000 +0300
@@ -409,6 +409,7 @@
'browser/extensions/api/system_info_storage/storage_info_provider.cc',
'browser/extensions/api/system_info_storage/storage_info_provider.h',
'browser/extensions/api/system_info_storage/storage_info_provider_android.cc',
+ 'browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_linux.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_mac.cc',
'browser/extensions/api/system_info_storage/storage_info_provider_win.cc',
@@ -930,6 +931,14 @@
'browser/extensions/platform_app_launcher.h',
],
}],
+ ['os_bsd==1', {
+ 'sources!': [
+ 'browser/extensions/api/system_info_storage/storage_info_provider_linux.cc',
+ ],
+ 'sources': [
+ 'browser/extensions/api/system_info_storage/storage_info_provider_bsd.cc',
+ ],
+ }],
],
},
],

10
www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
View file

@ -1,11 +1,11 @@
--- chrome/renderer/printing/print_web_view_helper.h.orig 2013-07-15 18:53:40.000000000 +0300
+++ chrome/renderer/printing/print_web_view_helper.h 2013-07-15 18:54:07.000000000 +0300
@@ -213,7 +213,7 @@
--- chrome/renderer/printing/print_web_view_helper.h.orig 2013-08-30 06:47:03.000000000 +0300
+++ chrome/renderer/printing/print_web_view_helper.h 2013-09-03 21:39:51.232633592 +0300
@@ -231,7 +231,7 @@
void FinishFramePrinting();
// Prints the page listed in |params|.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
const gfx::Size& canvas_size,
WebKit::WebFrame* frame,

11
www/chromium/files/patch-chrome__tools__build__generate_policy_source.py Normal file
View file

@ -0,0 +1,11 @@
--- chrome/tools/build/generate_policy_source.py.orig 2013-09-24 21:55:28.000000000 +0300
+++ chrome/tools/build/generate_policy_source.py 2013-09-24 21:56:43.000000000 +0300
@@ -67,7 +67,7 @@
if platform.startswith('chrome.'):
platform_sub = platform[7:]
if platform_sub == '*':
- self.platforms.extend(['win', 'mac', 'linux'])
+ self.platforms.extend(['win', 'mac', 'linux', 'freebsd'])
else:
self.platforms.append(platform_sub)
else:

12
www/chromium/files/patch-content__browser__plugin_service_impl.cc Normal file
View file

@ -0,0 +1,12 @@
--- content/browser/plugin_service_impl.cc.orig 2013-08-30 06:45:42.000000000 +0300
+++ content/browser/plugin_service_impl.cc 2013-09-03 22:45:55.464628229 +0300
@@ -790,7 +790,8 @@
}
bool PluginServiceImpl::NPAPIPluginsSupported() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
+ (defined(OS_LINUX) && !defined(USE_AURA))
return true;
#else
return false;

41
www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
View file

@ -1,20 +1,43 @@
--- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-09-02 21:19:59.000000000 +0300
+++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-02 21:22:12.000000000 +0300
@@ -24,7 +24,7 @@
--- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-08-30 06:45:44.000000000 +0300
+++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-03 21:47:30.139633005 +0300
@@ -26,10 +26,10 @@
// The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
// will fail if the user selects any rate outside these ranges.
static int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
static int kValidInputRates[] = {48000, 44100};
-const int kValidInputRates[] = {48000, 44100};
#elif defined(OS_ANDROID)
static int kValidInputRates[] = {48000, 44100};
@@ -37,7 +37,7 @@
const int kValidInputRates[] = {48000, 44100};
+#elif defined(OS_POSIX)
+const int kValidInputRates[] = {48000, 44100};
#else
const int kValidInputRates[] = {44100};
#endif
@@ -39,14 +39,14 @@
#if defined(OS_WIN) || defined(OS_MACOSX)
// Use a buffer size of 10ms.
buffer_size = (sample_rate / 100);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
+#elif defined(OS_ANDROID)
+ // TODO(leozwang): Tune and adjust buffer size on Android.
+ buffer_size = 2 * sample_rate / 100;
+#elif defined(OS_POSIX)
// Based on tests using the current ALSA implementation in Chrome, we have
// found that the best combination is 20ms on the input side and 10ms on the
// output side.
buffer_size = 2 * sample_rate / 100;
-#elif defined(OS_ANDROID)
- // TODO(leozwang): Tune and adjust buffer size on Android.
- buffer_size = 2 * sample_rate / 100;
#endif
return buffer_size;
}
@@ -430,7 +430,7 @@
// CaptureCallback.
#if defined(OS_WIN) || defined(OS_MACOSX)
DCHECK_LE(volume, 1.0);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
// We have a special situation on Linux where the microphone volume can be
// "higher than maximum". The input volume slider in the sound preference
// allows the user to set a scaling that is higher than 100%. It means that

11
www/chromium/files/patch-content__renderer__media__webrtc_audio_device_impl.cc
View file

@ -1,11 +0,0 @@
--- content/renderer/media/webrtc_audio_device_impl.cc.orig 2013-09-02 21:19:20.000000000 +0300
+++ content/renderer/media/webrtc_audio_device_impl.cc 2013-09-02 21:21:36.000000000 +0300
@@ -67,7 +67,7 @@
DCHECK_LE(number_of_frames, input_buffer_size());
#if defined(OS_WIN) || defined(OS_MACOSX)
DCHECK_LE(volume, 1.0);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
// We have a special situation on Linux where the microphone volume can be
// "higher than maximum". The input volume slider in the sound preference
// allows the user to set a scaling that is higher than 100%. It means that

8
www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc → www/chromium/files/patch-content__renderer__pepper__pepper_plugin_instance_impl.cc
View file

@ -1,11 +1,11 @@
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2013-04-30 10:22:18.000000000 +0300
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2013-05-07 21:26:49.000000000 +0300
@@ -1627,7 +1627,7 @@
--- content/renderer/pepper/pepper_plugin_instance_impl.cc.orig 2013-09-03 22:52:07.565628190 +0300
+++ content/renderer/pepper/pepper_plugin_instance_impl.cc 2013-09-03 22:52:34.954633148 +0300
@@ -1723,7 +1723,7 @@
#endif // defined(OS_WIN)
bool ret = false;
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FREEBSD)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
// On Linux we just set the final bits in the native metafile
// (NativeMetafile and PreviewMetafile must have compatible formats,
// i.e. both PDF for this to work).

11
www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc Normal file
View file

@ -0,0 +1,11 @@
--- content/renderer/pepper/usb_key_code_conversion.cc.orig 2013-09-03 23:00:20.220628554 +0300
+++ content/renderer/pepper/usb_key_code_conversion.cc 2013-09-03 23:02:18.736631955 +0300
@@ -10,7 +10,7 @@
namespace content {
-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN)
+#if !((defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN))
uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
return 0;

35
www/chromium/files/patch-issue-17359002
View file

@ -1,35 +0,0 @@
Index: tools/gyp/pylib/gyp/generator/ninja.py
===================================================================
--- tools/gyp/pylib/gyp/generator/ninja.py (revision 1690)
+++ tools/gyp/pylib/gyp/generator/ninja.py (working copy)
@@ -755,9 +755,16 @@
self.WriteVariableList(ninja_file, 'pchprefix', [self.name])
else:
cflags = config.get('cflags', [])
- cflags_c = config.get('cflags_c', [])
- cflags_cc = config.get('cflags_cc', [])
+ # Respect environment variables related to build, but target-specific
+ # flags can still override them.
+ cflags_c = (os.environ.get('CPPFLAGS', '').split() +
+ os.environ.get('CFLAGS', '').split() +
+ config.get('cflags_c', []))
+ cflags_cc = (os.environ.get('CPPFLAGS', '').split() +
+ os.environ.get('CXXFLAGS', '').split() +
+ config.get('cflags_cc', []))
+
defines = config.get('defines', []) + extra_defines
self.WriteVariableList(ninja_file, 'defines',
[Define(d, self.flavor) for d in defines])
@@ -932,7 +939,10 @@
if def_file:
implicit_deps.add(def_file)
else:
- ldflags = config.get('ldflags', [])
+ # Respect environment variables related to build, but target-specific
+ # flags can still override them.
+ ldflags = (os.environ.get('LDFLAGS', '').split() +
+ config.get('ldflags', []))
if is_executable and len(solibs):
rpath = 'lib/'
if self.toolset != 'target':

10
www/chromium/files/patch-media__base__audio_splicer.cc
View file

@ -1,5 +1,5 @@
--- media/base/audio_splicer.cc.orig 2013-02-21 04:24:13.000000000 +0100
+++ media/base/audio_splicer.cc 2013-02-26 12:33:35.000000000 +0100
--- media/base/audio_splicer.cc.orig 2013-08-30 06:47:05.000000000 +0300
+++ media/base/audio_splicer.cc 2013-09-03 22:08:02.140628065 +0300
@@ -60,7 +60,7 @@
base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp();
base::TimeDelta delta = timestamp - expected_timestamp;
@ -11,10 +11,10 @@
}
@@ -69,7 +69,7 @@
if (delta != base::TimeDelta())
bytes_to_fill = output_timestamp_helper_.GetBytesToTarget(timestamp);
frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
- if (bytes_to_fill == 0 || std::abs(bytes_to_fill) < min_gap_size_) {
+ if (bytes_to_fill == 0 || std::labs(bytes_to_fill) < min_gap_size_) {
- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) {
+ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) {
AddOutputBuffer(input);
return true;
}

13
www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
View file

@ -1,10 +1,11 @@
--- media/filters/decrypting_audio_decoder.cc.orig 2013-01-07 18:40:10.000000000 -0800
+++ media/filters/decrypting_audio_decoder.cc 2013-01-12 09:05:12.737640582 -0800
--- media/filters/decrypting_audio_decoder.cc.orig 2013-08-30 06:47:05.000000000 +0300
+++ media/filters/decrypting_audio_decoder.cc 2013-09-03 22:11:24.289626887 +0300
@@ -30,7 +30,7 @@
// Out of sync of 100ms would be pretty noticeable and we should keep any
// drift below that.
const int64 kOutOfSyncThresholdInMicroseconds = 100000;
- return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
+ return std::labs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
kOutOfSyncThresholdInMicroseconds;
const int64 kOutOfSyncThresholdInMilliseconds = 100;
- return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
+ return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
kOutOfSyncThresholdInMilliseconds;
}

17
www/chromium/files/patch-net__net.gyp
View file

@ -1,6 +1,6 @@
--- net/net.gyp.orig 2013-08-19 02:54:02.000000000 +0300
+++ net/net.gyp 2013-09-01 00:26:02.000000000 +0300
@@ -1259,9 +1259,10 @@
--- net/net.gyp.orig 2013-09-20 05:36:19.000000000 +0300
+++ net/net.gyp 2013-09-23 20:45:35.000000000 +0300
@@ -1283,9 +1283,10 @@
}],
['os_bsd==1', {
'sources!': [
@ -12,7 +12,16 @@
],
},{
'dependencies': [
@@ -2076,6 +2077,11 @@
@@ -1865,7 +1866,7 @@
'websockets/websocket_throttle_unittest.cc',
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
'dependencies': [
'quic_library',
'flip_in_mem_edsm_server_library',
@@ -2140,6 +2141,11 @@
'cert/x509_cert_types_unittest.cc',
],
}],

20
www/chromium/files/patch-skia__skia.gyp
View file

@ -1,20 +0,0 @@
--- skia/skia.gyp.orig 2013-08-18 20:57:26.000000000 +0300
+++ skia/skia.gyp 2013-08-18 21:08:51.000000000 +0300
@@ -284,7 +284,7 @@
},
}],
#Settings for text blitting, chosen to approximate the system browser.
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or os_bsd == 1', {
'defines': [
'SK_GAMMA_EXPONENT=1.2',
'SK_GAMMA_CONTRAST=0.2',
@@ -312,7 +312,7 @@
# For POSIX platforms, prefer the Mutex implementation provided by Skia
# since it does not generate static initializers.
- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
+ [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios" or os_bsd == 1', {
'defines+': [
'SK_USE_POSIX_THREADS',
],

11
www/chromium/files/patch-skia__skia_chrome.gypi Normal file
View file

@ -0,0 +1,11 @@
--- skia/skia_chrome.gypi.orig 2013-09-24 22:30:33.000000000 +0300
+++ skia/skia_chrome.gypi 2013-09-24 22:29:39.000000000 +0300
@@ -85,7 +85,7 @@
# For POSIX platforms, prefer the Mutex implementation provided by Skia
# since it does not generate static initializers.
# TODO: should check if SK_USE_POSIX_THREADS is defined instead
- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
+ [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios" or os_bsd == 1', {
'sources!': [
'ext/SkThread_chrome.cc',
],

20
www/chromium/files/patch-skia__skia_library.gypi Normal file
View file

@ -0,0 +1,20 @@
--- skia/skia_library.gypi.orig 2013-09-03 22:15:35.743627150 +0300
+++ skia/skia_library.gypi 2013-09-03 22:17:46.187628519 +0300
@@ -214,7 +214,7 @@
}],
#Settings for text blitting, chosen to approximate the system browser.
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or os_bsd == 1', {
'defines': [
'SK_GAMMA_EXPONENT=1.2',
'SK_GAMMA_CONTRAST=0.2',
@@ -242,7 +242,7 @@
# For POSIX platforms, prefer the Mutex implementation provided by Skia
# since it does not generate static initializers.
- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
+ [ 'os_posix == 1 or OS == "ios"', {
'defines+': [
'SK_USE_POSIX_THREADS',
],

17
www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
View file

@ -1,15 +1,6 @@
--- third_party/WebKit/Source/core/features.gypi.orig 2013-07-15 19:58:55.000000000 +0300
+++ third_party/WebKit/Source/core/features.gypi 2013-07-15 20:00:22.000000000 +0300
@@ -103,7 +103,7 @@
'ENABLE_WEB_AUDIO=1',
],
}],
- ['OS=="linux" or OS=="mac" or OS=="android"', {
+ ['OS=="linux" or OS=="mac" or OS=="android" or os_bsd==1', {
'feature_defines': [
# 8Bit text runs should be enabled for all platforms webkit.org/b/111348
'ENABLE_8BIT_TEXTRUN=1',
@@ -128,7 +128,7 @@
--- third_party/WebKit/Source/core/features.gypi.orig 2013-08-30 06:55:03.000000000 +0300
+++ third_party/WebKit/Source/core/features.gypi 2013-09-03 22:27:08.777629842 +0300
@@ -94,7 +94,7 @@
'ENABLE_WEB_AUDIO=1',
],
}],
@ -18,7 +9,7 @@
'feature_defines': [
'ENABLE_OPENTYPE_VERTICAL=1',
],
@@ -143,7 +143,7 @@
@@ -104,7 +104,7 @@
'ENABLE_RUBBER_BANDING=1',
],
}],

6
www/chromium/files/patch-third_party__WebKit__Tools__DumpRenderTree__DumpRenderTree.gyp__DumpRenderTree.gyp → www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
View file

@ -1,6 +1,6 @@
--- third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.orig 2013-08-19 03:03:10.000000000 +0300
+++ third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-08-30 23:14:53.000000000 +0300
@@ -377,5 +377,12 @@
--- third_party/WebKit/Source/testing/testing.gyp.orig 2013-09-03 23:36:08.000000000 +0300
+++ third_party/WebKit/Source/testing/testing.gyp 2013-09-03 23:37:05.000000000 +0300
@@ -339,5 +339,12 @@
},
},
}],

4
www/chromium/files/patch-third_party__WebKit__Source__WebKit__chromium__WebKit.gyp → www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
View file

@ -1,5 +1,5 @@
--- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig 2013-07-15 19:48:12.000000000 +0300
+++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp 2013-07-15 19:48:46.000000000 +0300
--- third_party/WebKit/Source/web/web.gyp.orig 2013-07-15 19:48:12.000000000 +0300
+++ third_party/WebKit/Source/web/web.gyp 2013-07-15 19:48:46.000000000 +0300
@@ -646,7 +646,7 @@
},
},

13
www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
View file

@ -1,13 +0,0 @@
--- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200
+++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200
@@ -38,6 +38,10 @@
#include "talk/base/messagehandler.h"
#include "talk/base/sigslot.h"
+#if defined(OS_FREEBSD)
+#include <sys/types.h>
+#endif
+
#if defined(POSIX)
struct ifaddrs;
#endif // defined(POSIX)

13
www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
View file

@ -1,14 +1,5 @@
--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-09-03 03:20:59.000000000 -0400
+++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-09-12 15:47:30.000000000 -0400
@@ -36,7 +36,7 @@
#elif defined(OSX)
#include <ApplicationServices/ApplicationServices.h>
#include <CoreServices/CoreServices.h>
-#elif defined(LINUX) || defined(ANDROID)
+#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
#include <unistd.h>
#endif
#if defined(OSX) || defined(IOS)
--- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-07-15 17:40:34.000000000 +0300
+++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-07-15 17:41:14.000000000 +0300
@@ -48,7 +48,7 @@
#include "talk/base/win32.h"
#elif defined(OSX)

10
www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
View file

@ -1,10 +0,0 @@
--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2013-09-03 03:23:27.000000000 -0400
+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2013-09-12 14:54:49.000000000 -0400
@@ -12,6 +12,7 @@
#include <algorithm>
#include <cassert>
+#include <cstdlib>
#include <cstring>
#include <iterator>

11
www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc
View file

@ -1,11 +0,0 @@
--- third_party/webrtc/video_engine/stream_synchronization.cc.orig 2013-09-03 03:23:20.000000000 -0400
+++ third_party/webrtc/video_engine/stream_synchronization.cc 2013-09-12 15:58:27.000000000 -0400
@@ -12,7 +12,7 @@
#include <algorithm>
#include <assert.h>
-#include <cmath>
+#include <cstdlib>
#include "webrtc/system_wrappers/interface/trace.h"

11
www/chromium/files/patch-webkit__plugins__npapi__plugin_utils.cc
View file

@ -1,11 +0,0 @@
--- webkit/plugins/npapi/plugin_utils.cc.orig 2013-05-12 20:08:18.000000000 +0300
+++ webkit/plugins/npapi/plugin_utils.cc 2013-05-12 20:10:33.000000000 +0300
@@ -45,7 +45,7 @@
}
bool NPAPIPluginsSupported() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || (defined(OS_LINUX) && !defined(USE_AURA))
return true;
#else
return false;

12
www/chromium/files/patch-webkit__plugins__ppapi__usb_key_code_conversion.cc
View file

@ -1,12 +0,0 @@
--- webkit/plugins/ppapi/usb_key_code_conversion.cc.orig 2013-08-18 21:36:48.000000000 +0300
+++ webkit/plugins/ppapi/usb_key_code_conversion.cc 2013-08-18 21:37:12.000000000 +0300
@@ -11,7 +11,8 @@
namespace webkit {
namespace ppapi {
-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN)
+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) && \
+ !defined(OS_BSD)
uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
return 0;

5
www/chromium/pkg-plist
View file

@ -67,7 +67,6 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/breakpointsList.css
%%DATADIR%%/resources/inspector/buildSystemOnly.js
%%DATADIR%%/resources/inspector/flameChart.css
%%DATADIR%%/resources/inspector/showhint.css
%%DATADIR%%/resources/inspector/sidebarPane.css
%%DATADIR%%/resources/inspector/auditsPanel.css
%%DATADIR%%/resources/inspector/AuditsPanel.js
@ -185,14 +184,11 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/Images/timelinePillPurple.png
%%DATADIR%%/resources/inspector/Images/timelinePillRed.png
%%DATADIR%%/resources/inspector/Images/timelinePillYellow.png
%%DATADIR%%/resources/inspector/Images/toolbarIcons.png
%%DATADIR%%/resources/inspector/Images/toolbarIconsSmall.png
%%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png
%%DATADIR%%/resources/inspector/Images/trackHoriz.png
%%DATADIR%%/resources/inspector/Images/trackVert.png
%%DATADIR%%/resources/inspector/indexedDBViews.css
%%DATADIR%%/resources/inspector/inspectorCommon.css
%%DATADIR%%/resources/inspector/nativeMemoryProfiler.css
%%DATADIR%%/resources/inspector/navigatorView.css
%%DATADIR%%/resources/inspector/networkLogView.css
%%DATADIR%%/resources/inspector/networkPanel.css
@ -210,7 +206,6 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/spectrum.css
%%DATADIR%%/resources/inspector/splitView.css
%%DATADIR%%/resources/inspector/tabbedPane.css
%%DATADIR%%/resources/inspector/textEditor.css
%%DATADIR%%/resources/inspector/textPrompt.css
%%DATADIR%%/resources/inspector/timelinePanel.css
%%DATADIR%%/resources/inspector/TimelinePanel.js