Attachment 52931 Details for Bug 36578 – Patch

[patch] Patch

bug-36578-20100409111638.patch (text/plain), 7.87 KB, created by Tony Chang on 2010-04-08 19:16:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Chang

Created: 2010-04-08 19:16:40 PDT

Size: 7.87 KB

patch

obsolete

>diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
>index e387f72..3914006 100644
>--- a/WebKit/chromium/ChangeLog
>+++ b/WebKit/chromium/ChangeLog
>@@ -1,3 +1,13 @@
>+2010-04-08  Tony Chang  <tony@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [chromium] update chromium DEPS for upstream compile
>+        https://bugs.webkit.org/show_bug.cgi?id=36578
>+
>+        * DEPS:
>+        * gyp_webkit: Add DumpRenderTree.gyp so we generate xcode projects for DRT.
>+
> 2010-04-07  Pavel Feldman  <pfeldman@chromium.org>
> 
>         Reviewed by Yury Semikhatsky.
>diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
>index 3dc1cd4..77738b4 100644
>--- a/WebKit/chromium/DEPS
>+++ b/WebKit/chromium/DEPS
>@@ -32,33 +32,20 @@
> 
> vars = {
>   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
>-  'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
>-
>-  # Dependencies' revisions to use:
>   'chromium_rev': '43715',
>-  'google-url_rev': '127',
>-  'gtest_rev': '408',
>-  'gyp_rev': '810',
>-  'icu_rev': '43139',
>-  'openvcdiff_rev': '28',
>-  'ots_rev': '26',
>-  'skia_rev': '504',
>-  'v8_rev': '4335',
>-
>-  # Windows:
>-  'cygwin_rev': '11984',
>-  'ffmpeg_ia32_rev': '42726',
>+
>   'pthreads-win32_rev': '26716',
>-  'python_24_rev': '22967',
>-  'nss_rev': '39612',
> }
> 
> deps = {
>+  'chromium_deps':
>+    File(Var('chromium_svn')+'/DEPS@'+Var('chromium_rev')),
>+
>   # build tools
>   'build':
>     Var('chromium_svn')+'/build@'+Var('chromium_rev'),
>   'tools/gyp':
>-    'http://gyp.googlecode.com/svn/trunk@'+Var('gyp_rev'),
>+    From('chromium_deps', 'src/tools/gyp'),
> 
>   # Basic tools
>   'base':
>@@ -69,20 +56,19 @@ deps = {
>   # skia dependencies
>   'skia':
>     Var('chromium_svn')+'/skia@'+Var('chromium_rev'),
>-  'third_party/skia':
>-    'http://skia.googlecode.com/svn/trunk@'+Var('skia_rev'),
>+  'third_party/skia/src':
>+    From('chromium_deps', 'src/third_party/skia/src'),
>+  'third_party/skia/include':
>+    From('chromium_deps', 'src/third_party/skia/include'),
> 
>   # testing
>   'testing':
>     Var('chromium_svn')+'/testing@'+Var('chromium_rev'),
>   'testing/gtest':
>-    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
>+    From('chromium_deps', 'src/testing/gtest'),
> 
>   # v8 javascript engine
>-  'v8':
>-    'http://v8.googlecode.com/svn/trunk@'+Var('v8_rev'),
>-  'testing/gtest':
>-    'http://googletest.googlecode.com/svn/trunk@'+Var('gtest_rev'),
>+  'v8': From('chromium_deps', 'src/v8'),
> 
>   # net dependencies
>   'net':
>@@ -90,13 +76,35 @@ deps = {
>   'sdch':
>     Var('chromium_svn')+'/sdch@'+Var('chromium_rev'),
>   'sdch/open-vcdiff':
>-    'http://open-vcdiff.googlecode.com/svn/trunk@'+Var('openvcdiff_rev'),
>+    From('chromium_deps', 'src/sdch/open-vcdiff'),
>   'googleurl':
>-    'http://google-url.googlecode.com/svn/trunk@'+Var('google-url_rev'),
>+    From('chromium_deps', 'src/googleurl'),
>+
>+  # webkit dependencis
>+  'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'),
>+
>+  'app':
>+    Var('chromium_svn')+'/app@'+Var('chromium_rev'), # needed by appcache
>+  'gpu':
>+    Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
>+  'media':
>+    Var('chromium_svn')+'/media@'+Var('chromium_rev'),
>+  'third_party/glew':  # webgl related
>+    Var('chromium_svn')+'/third_party/glew@'+Var('chromium_rev'),
>+  'third_party/ffmpeg': # needed by webkit/media
>+    Var('chromium_svn')+'/third_party/ffmpeg@'+Var('chromium_rev'),
>+  'third_party/yasm': # needed by ffmpeg
>+    Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'),
>+  'third_party/openmax': # needed by webkit/media
>+    Var('chromium_svn')+'/third_party/openmax@'+Var('chromium_rev'),
>+  'tools/grit':
>+    Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'),
>+  'tools/generate_stubs':
>+    Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
> 
>   # other third party
>   'third_party/icu':
>-    Var('chromium_deps_svn')+'/icu42@'+Var('icu_rev'),
>+    From('chromium_deps', 'src/third_party/icu'),
> 
>   'third_party/bzip2':
>     Var('chromium_svn')+'/third_party/bzip2@'+Var('chromium_rev'),
>@@ -123,7 +131,7 @@ deps = {
>     Var('chromium_svn')+'/third_party/npapi@'+Var('chromium_rev'),
> 
>   'third_party/ots':
>-    'http://ots.googlecode.com/svn/trunk@'+Var('ots_rev'),
>+    From('chromium_deps', 'src/third_party/ots'),
> 
>   'third_party/sqlite':
>     Var('chromium_svn')+'/third_party/sqlite@'+Var('chromium_rev'),
>@@ -138,26 +146,30 @@ deps = {
> deps_os = {
>   'win': {
>     'third_party/cygwin':
>-      Var('chromium_deps_svn')+'/cygwin@'+Var('cygwin_rev'),
>-
>+      From('chromium_deps', 'src/third_party/cygwin'),
>     'third_party/python_24':
>-      Var('chromium_deps_svn')+'/python_24@'+Var('python_24_rev'),
>-
>+      From('chromium_deps', 'src/third_party/python_24'),
>     'third_party/ffmpeg/binaries/chromium/win/ia32':
>-      Var('chromium_deps_svn')+'/ffmpeg/binaries/win@'+Var('ffmpeg_ia32_rev'),
>-
>+      From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
>     'third_party/pthreads-win32':
>-      Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
>-
>-   # base.gypi depends on nss on Windows
>-   'third_party/nss':
>-      Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'),
>+      'http://src.chromium.org/svn/trunk/deps/third_party/pthreads-win32@'+Var('pthreads-win32_rev'),
>+    # base.gypi depends on nss on Windows
>+    'third_party/nss':
>+      From('chromium_deps', 'src/third_party/nss'),
>+    'third_party/wtl':
>+      Var('chromium_svn')+'/third_party/wtl@'+Var('chromium_rev'),
>+  },
>+  'mac': {
>+    # needed by ffmpeg
>+    'third_party/yasm/source/patched-yasm':
>+      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
>+    'third_party/ffmpeg/source/patched-ffmpeg-mt':
>+      From('chromium_deps', 'src/third_party/ffmpeg/source/patched-ffmpeg-mt'),
>   },
>   'unix': {
>     # Linux, actually.
>     'third_party/harfbuzz':
>       Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'),
>-
>     'tools/xdisplaycheck':
>       Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
>   },
>diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit
>index ef18239..1588a1c 100644
>--- a/WebKit/chromium/gyp_webkit
>+++ b/WebKit/chromium/gyp_webkit
>@@ -91,8 +91,9 @@ if __name__ == '__main__':
>                # gyp hack: otherwise gyp assumes its in chromium's src/ dir.
>                '--depth=./',
> 
>-               # gyp file to execute.
>-               'WebKit.gyp'])
>+               # gyp files to execute.
>+               'WebKit.gyp',
>+               '../../WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp'])
> 
>   print 'Updating webkit projects from gyp files...'
>   sys.stdout.flush()
>diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
>index 6d0b1da..a5be49a 100644
>--- a/WebKitTools/ChangeLog
>+++ b/WebKitTools/ChangeLog
>@@ -1,3 +1,13 @@
>+2010-04-08  Tony Chang  <tony@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [chromium] update chromium DEPS for upstream compile
>+        https://bugs.webkit.org/show_bug.cgi?id=36578
>+
>+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Small fix to avoid a circular dependency between
>+          WebKit.gyp and webkit.gyp.
>+
> 2010-04-08  Sam Weinig  <sam@webkit.org>
> 
>         Reviewed by Darin Adler.
>diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp b/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
>index 2fe95c0..5c84c6f 100644
>--- a/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
>+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
>@@ -57,7 +57,7 @@
>                 '<(webkit_api_dir)/WebKit.gyp:webkit',
>                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
>                 '<(chromium_src_dir)/skia/skia.gyp:skia',
>-                '<(chromium_src_dir)/webkit/webkit.gyp:webkit_support',
>+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
>             ],
>             'include_dirs': [
>                 '.',

Actions: View | Formatted Diff | Diff

Attachments on bug 36578: 51594 | 52931 | 53122