summaryrefslogtreecommitdiffstats
path: root/WebCore/inspector
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1939-1824/+1090
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1839-1090/+1824
|
* Fix the last of the linker errors !Ben Murdoch2009-08-171-4/+14
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1189-1355/+6190
|
* Get WebKit r44544.Feng Qian2009-06-1745-1556/+2833
|
* Make WebCore built with V8.Feng Qian2009-04-241-3/+25
| | | | Picked up several new files from Chrome port.
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-1029-1342/+1866
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0518-194/+342
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03168-0/+24648
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03168-24648/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17168-0/+24648
generated by cgit v1.1 at 2024-07-01 23:06:36 +0000