summaryrefslogtreecommitdiffstats
path: root/WebCore/inspector
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12348-68471/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-1081-3216/+2993
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at Chromium 9.0.597.107: Initial merge by git.Ben Murdoch2011-02-282-9/+1
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78920 on the 597 release branch. Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-168-79/+71
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-0717-115/+148
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Cherry-pick WebKit change 72948Steve Block2011-01-061-0/+1
| | | | | | | | | | | | | | | This fixes CodeGeneratorV8.pm It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm', which was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/72948 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0629-419/+120
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-2265-1527/+2476
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Fix CodeGeneratorV8.pmRussell Brenner2010-12-021-0/+1
| | | | | | | | | | Some of the script-generation code puts include statements in source files when they need to be in headers. Cherry-picked from webkit: http://trac.webkit.org/changeset/72948 Change-Id: I07d425bcb97abcdda25b5ff2ea7af887a925f489
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0245-839/+1239
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Resolve conflit with INSPECTORTeng-Hui Zhu2010-11-175-4/+12
| | | | | | | This is a cherry pick from one latest webkit fix. http://trac.webkit.org/changeset/71981 Change-Id: I46d45af50654d836c7bfcf4c7d2d58a827cd366b
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1765-4042/+2381
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-0958-1756/+3281
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2673-1978/+6705
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r68651 : Add guards for ENABLED(INSPECTOR)Kristian Monsen2010-10-071-0/+4
| | | | | | | | | | This has been fixed upstream in this CL (which this is a cherrry-pick of): http://trac.webkit.org/changeset/68763/trunk/WebCore/inspector/InspectorController.h And later removed upstream in this CL: http://trac.webkit.org/changeset/68767/trunk/WebCore/inspector/InspectorController.h Change-Id: I4c724f2f52a5a9db6dca6b58032b6a902aac74b5
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0732-735/+3008
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2933-389/+1124
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1631-246/+528
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1149-367/+2033
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0258-1021/+1564
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2345-941/+1045
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072: JSC build fix in InspectorController.hBen Murdoch2010-08-131-0/+1
| | | | | | | | | Cherry pick of http://trac.webkit.org/changeset/65258 http://trac.webkit.org/changeset/64722 introduced a build break when INSPECTOR is not enabled. Change-Id: I8791737a6c399245b84a8adc9830364ac4df907d
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1262-2726/+1723
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0919-24/+844
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0441-645/+579
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-271-4/+0
| | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2740-424/+837
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector ↵Leon Clarke2010-07-202-0/+11
| | | | | | case doesn't seem to compile Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2041-814/+1735
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0917-93/+144
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0240-367/+1127
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Add forward declaration instead of include, as ↵Ben Murdoch2010-06-181-1/+1
| | | | | | | | | | the content of the included is guarded out. This needs to be upstreamed. See http://trac.webkit.org/changeset/61014 Upstreaming being tracked in https://bugs.webkit.org/show_bug.cgi?id=40790 Change-Id: I12d4dc5030b1cd86af554845cfebb7c61d194e47
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1649-532/+1701
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0846-571/+1512
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2713-85/+96
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2533-341/+1198
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1437-436/+1004
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11109-4675/+6905
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2745-983/+1133
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1646-2464/+2926
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1537-748/+960
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04100-3711/+11611
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1783-2748/+6081
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Add a guard on InspectorTimelineAgent, and remove unnecessary guards...Nicolas Roard2009-11-132-14/+3
|
* Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().Steve Block2009-11-101-0/+5
| | | | | | See http://trac.webkit.org/changeset/50068 Change-Id: Ib330cd0a5bb53f262236b38cd0fb771fd7b7d4dc
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1065-1763/+3601
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-6/+4
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-10/+0
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2088-2909/+7400
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
generated by cgit v1.1 at 2024-07-04 01:02:35 +0000