summaryrefslogtreecommitdiffstats
path: root/webkit/webkit_resources.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Reland: Remove webkit_chromium_resources.pak entries.tfarina@chromium.org2013-08-021-7/+0
| | | | | | | | | | | | | | | webkit_chromium_resources.pak was kept along side with blink_resources.pak, while DumpRenderTree was being updated on the Blink side, since that already happened and Blink has rolled into Chromium, we should be able to remove this now. TBR=tfarina@chromium.org BUG=265748 NOTRY=true Review URL: https://codereview.chromium.org/21952005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215397 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 215210 "Remove webkit_chromium_resources.pak entries." because it was ↵pkotwicz@chromium.org2013-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing the chromium_builder_qa to fail. I do not think the fix is complex, but I am not set up to build Chrome on Windows quickly Builder output: 804>Time Elapsed 00:05:33.76 809>------ Build started: Project: chromium_builder_qa, Configuration: Release Win32 ------ 809>Build started 8/2/2013 8:09:33 AM. 768>RC : fatal error RC1110: could not open ..\build\Release\obj\global_intermediate\webkit\webkit_chromium_resources.rc 768> 768> 768>Build FAILED. > Remove webkit_chromium_resources.pak entries. > > webkit_chromium_resources.pak was kept along side with blink_resources.pak, > while DumpRenderTree was being updated on the Blink side, since that already > happened and Blink has rolled into Chromium, we should be able to remove this > now. > > BUG=265748 > TBR=abarth@chromium.org, thestig@chromium.org > > Review URL: https://codereview.chromium.org/20628004 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/21937002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215311 0039d316-1c4b-4281-b951-d872f2087c98
* Remove webkit_chromium_resources.pak entries.tfarina@chromium.org2013-08-021-7/+0
| | | | | | | | | | | | | | webkit_chromium_resources.pak was kept along side with blink_resources.pak, while DumpRenderTree was being updated on the Blink side, since that already happened and Blink has rolled into Chromium, we should be able to remove this now. BUG=265748 TBR=abarth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/20628004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215210 0039d316-1c4b-4281-b951-d872f2087c98
* Reland "Include entries to blink_resources."tfarina@chromium.org2013-07-301-1/+8
| | | | | | | | | | | This was reverted in r214248 because it increased the size of chrome.pak. R=abarth@chromium.org, joth@chromium.org, thestig@chromium.org,taysom@chromium.org TBR=darin Review URL: https://codereview.chromium.org/21121005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214294 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 214239 "Include entries to blink_resources."dewittj@chromium.org2013-07-291-8/+1
| | | | | | | | | | | | | | | | | | | | | | Attempted fix for: Failed Sizes PERF_REGRESS: chrome.pak/chrome.pak (1.89%), chrome.pak/chrome.pak (1.89%) > Include entries to blink_resources. > > We can't remove entries of webkit_chromium_resources just yet, because on > Blink side DumpRenderTree is still using it through Chromium :( > > TBR=abarth@chromium.org, joth@chromium.org, thestig@chromium.org > > Review URL: https://codereview.chromium.org/20329005 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/21014006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214248 0039d316-1c4b-4281-b951-d872f2087c98
* Include entries to blink_resources.tfarina@chromium.org2013-07-291-1/+8
| | | | | | | | | | | We can't remove entries of webkit_chromium_resources just yet, because on Blink side DumpRenderTree is still using it through Chromium :( TBR=abarth@chromium.org, joth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/20329005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214239 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 213636 "Switch Chromium to use Blink's blink_resources.grd"bulach@chromium.org2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | Broke the build with: error: 'gen/webkit/webkit_chromium_resources.pak', needed by 'DumpRenderTree.pak', missing and no known rule to make it > Switch Chromium to use Blink's blink_resources.grd > > WebKit.grd is deprecated, so we update it public/blink_resources.grd. > > R=darin@chromium.org, joth@chromium.org, thestig@chromium.org > > Review URL: https://codereview.chromium.org/19537010 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/20341002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213640 0039d316-1c4b-4281-b951-d872f2087c98
* Switch Chromium to use Blink's blink_resources.grdtfarina@chromium.org2013-07-251-1/+1
| | | | | | | | | | WebKit.grd is deprecated, so we update it public/blink_resources.grd. R=darin@chromium.org, joth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/19537010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213636 0039d316-1c4b-4281-b951-d872f2087c98
* Remove forwarding webkit_temp_(resources|strings) targetsjamesr@chromium.org2013-07-111-13/+0
| | | | | | | | | | | These aren't used as of https://src.chromium.org/viewvc/blink?revision=153833&view=revision. This completes the transition started in https://codereview.chromium.org/17472006/ TBR=darin Review URL: https://chromiumcodereview.appspot.com/18024014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211032 0039d316-1c4b-4281-b951-d872f2087c98
* Rename webkit_(resources|strings) targets to remove _temp infixjamesr@chromium.org2013-07-091-6/+17
| | | | | | | | | | | | | This is part 3 of the sequence started by https://codereview.chromium.org/17472006/. This updates all chromium-side targets to depend on the final target names, the only stragglers are dependencies in blink which still depend on the forwarding _temp targets defined in webkit_resources.gyp. R=darin Review URL: https://chromiumcodereview.appspot.com/18209009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210635 0039d316-1c4b-4281-b951-d872f2087c98
* Move webkit_resources / webkit_strings targets out of webkit_support.gypjamesr@chromium.org2013-07-041-0/+55
The webkit_resources / webkit_strings targets were defined in webkit_glue.gypi which gets pulled in to webkit/support/webkit_support.gyp. This makes it hard to extract other targets that depend on these (such as webkit_common) out of webkit_support.gyp without creating cycles between gyp files, which is forbidden due to the xcode generator. This pulls these leaf targets out so we can start extracting other targets out. R=darin Review URL: https://chromiumcodereview.appspot.com/17472006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210080 0039d316-1c4b-4281-b951-d872f2087c98