From 85c5c3d813fb3d6b47d0365cb798baa35fc4dc50 Mon Sep 17 00:00:00 2001 From: "timothy@apple.com" Date: Tue, 14 Feb 2012 18:44:47 +0000 Subject: [PATCH] Source/WebCore: Web Inspector: include failed and canceled in FrameResourceTree. https://webkit.org/b/78445 Reviewed by Pavel Feldman. Test: inspector/protocol/page-agent.html * WebCore.xcodeproj/project.pbxproj: Added Inspector.json, Inspector-0.1.json and Inspector-1.0.json for quick access and easy editing. * inspector/Inspector.json: Added failed and canceled as optional properties to the object for resources in FrameResourceTree. * inspector/InspectorPageAgent.cpp: (WebCore::InspectorPageAgent::buildObjectForFrameTree): Set those properties. LayoutTests: Test for Web Inspector: include failed and canceled in FrameResourceTree. https://webkit.org/b/78445 Reviewed by Pavel Feldman. * inspector/protocol/page-agent-expected.txt: Added. * inspector/protocol/page-agent.html: Added. * inspector/protocol/resources/dummy-iframe.html: Added. * inspector/protocol/resources/empty.png: Added. * inspector/protocol/resources/font1.ttf: Added. * inspector/protocol/resources/font2.ttf: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107714 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 15 +++ .../inspector/protocol/page-agent-expected.txt | 131 +++++++++++++++++++++ LayoutTests/inspector/protocol/page-agent.html | 49 ++++++++ .../inspector/protocol/resources/dummy-iframe.html | 6 + LayoutTests/inspector/protocol/resources/empty.png | Bin 0 -> 260 bytes LayoutTests/inspector/protocol/resources/font1.ttf | Bin 0 -> 28780 bytes LayoutTests/inspector/protocol/resources/font2.ttf | Bin 0 -> 28780 bytes Source/WebCore/ChangeLog | 16 +++ Source/WebCore/WebCore.xcodeproj/project.pbxproj | 6 + Source/WebCore/inspector/Inspector.json | 4 +- Source/WebCore/inspector/InspectorPageAgent.cpp | 5 + 11 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 LayoutTests/inspector/protocol/page-agent-expected.txt create mode 100644 LayoutTests/inspector/protocol/page-agent.html create mode 100644 LayoutTests/inspector/protocol/resources/dummy-iframe.html create mode 100644 LayoutTests/inspector/protocol/resources/empty.png create mode 100644 LayoutTests/inspector/protocol/resources/font1.ttf create mode 100644 LayoutTests/inspector/protocol/resources/font2.ttf diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 8ed5b84..67978ee 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,18 @@ +2012-02-14 Timothy Hatcher + + Test for Web Inspector: include failed and canceled in FrameResourceTree. + + https://webkit.org/b/78445 + + Reviewed by Pavel Feldman. + + * inspector/protocol/page-agent-expected.txt: Added. + * inspector/protocol/page-agent.html: Added. + * inspector/protocol/resources/dummy-iframe.html: Added. + * inspector/protocol/resources/empty.png: Added. + * inspector/protocol/resources/font1.ttf: Added. + * inspector/protocol/resources/font2.ttf: Added. + 2012-02-14 Kaustubh Atrawalkar [GTK] fast/forms/implicit-submission.html fails diff --git a/LayoutTests/inspector/protocol/page-agent-expected.txt b/LayoutTests/inspector/protocol/page-agent-expected.txt new file mode 100644 index 0000000..63bd619 --- /dev/null +++ b/LayoutTests/inspector/protocol/page-agent-expected.txt @@ -0,0 +1,131 @@ +Protocol stability test. It is dumping request/response pairs of PageAgent functions. + + +----------------------------------------------------------- +PageAgent.disable() + +request: +{ + method : "Page.disable" + id : +} + +response: +{ + result : { + } + id : +} + +----------------------------------------------------------- +PageAgent.enable() + +request: +{ + method : "Page.enable" + id : +} + +response: +{ + result : { + } + id : +} + +----------------------------------------------------------- +PageAgent.getResourceTree() + +request: +{ + method : "Page.getResourceTree" + id : +} + +response: +{ + result : { + frameTree : { + frame : { + id : + url : + loaderId : + securityOrigin : "file://" + mimeType : "text/html" + } + resources : [ + { + url : + type : "Script" + mimeType : "text/javascript" + } + { + url : + type : "Image" + mimeType : "" + failed : true + } + { + url : + type : "Font" + mimeType : "application/octet-stream" + } + { + url : + type : "Image" + mimeType : "image/png" + } + { + url : + type : "Font" + mimeType : "" + } + { + url : + type : "Script" + mimeType : "text/javascript" + } + ] + childFrames : [ + { + frame : { + id : + parentId : + name : "dummy" + url : + loaderId : + securityOrigin : "file://" + mimeType : "text/html" + } + resources : [ + ] + } + ] + } + } + id : +} + +=========================================================== +Coverage for PageAgent +{ + enable : "checked" + disable : "checked" + addScriptToEvaluateOnLoad : "not checked" + removeScriptToEvaluateOnLoad : "not checked" + reload : "not checked" + navigate : "not checked" + getCookies : "not checked" + deleteCookie : "not checked" + getResourceTree : "checked" + getResourceContent : "not checked" + searchInResource : "not checked" + searchInResources : "not checked" + setDocumentContent : "not checked" + setScreenSizeOverride : "not checked" + domContentEventFired : "not checked" + loadEventFired : "not checked" + frameNavigated : "not checked" + frameDetached : "not checked" +} + diff --git a/LayoutTests/inspector/protocol/page-agent.html b/LayoutTests/inspector/protocol/page-agent.html new file mode 100644 index 0000000..095f878 --- /dev/null +++ b/LayoutTests/inspector/protocol/page-agent.html @@ -0,0 +1,49 @@ + + + + + + + + +

+Protocol stability test. It is dumping request/response pairs of PageAgent functions. +

+ + + + + + + + + + + diff --git a/LayoutTests/inspector/protocol/resources/dummy-iframe.html b/LayoutTests/inspector/protocol/resources/dummy-iframe.html new file mode 100644 index 0000000..53a7f24 --- /dev/null +++ b/LayoutTests/inspector/protocol/resources/dummy-iframe.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/LayoutTests/inspector/protocol/resources/empty.png b/LayoutTests/inspector/protocol/resources/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..fd5b91ea07b947391714085ea9c763d3a7868d68 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bPrjj7PV1@&4zw>v1cuC&wE({E- zdXpl4`JKrXMkmr@>449Yzm-q1$H*Y$wiq3C3XdgMX7ludU^RJnQ4_8 zN~yU8C6#&wdFe`;Hu_K{Hu@0F`e2*7e#HI*x`)ft#W95Ada?zOeTd=Uj|=|7Ko*0i LtDnm{r-UW|%f3qN literal 0 HcmV?d00001 diff --git a/LayoutTests/inspector/protocol/resources/font1.ttf b/LayoutTests/inspector/protocol/resources/font1.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f9f997e635f7aee16ff1842d033a67c2b7435587 GIT binary patch literal 28780 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 literal 0 HcmV?d00001 diff --git a/LayoutTests/inspector/protocol/resources/font2.ttf b/LayoutTests/inspector/protocol/resources/font2.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f9f997e635f7aee16ff1842d033a67c2b7435587 GIT binary patch literal 28780 zcmeHw1$-4p*Z#N$cfY}%5Zr^iYw!Sp;6V!%cXxMp3GNOBTBuT?rL@pOp@mWb3KYoy z?B?E-yyd0I_tBF7@9SLloM-&mvpX}J+1UYMgisO?3?;7Hut4Co$KNMHsOM)8+O~c7 zknpu3V*?RNJ^=iq+xPG5QN>g^LJ5sKR$Db05<6nr+8;YVbZBIc6WKlwm*8 zh_-2+Zy&;WJ)X*)D@EY8;30V-Ah$mtn%7e$f@Z7Ipjnn+&qU9}>K!I}s(8XeIz+H+ zu7-%viNOUt5vXCa&LA5#^N$D$P8SVBgM&*#Im{^svOw~Q!B9dMZwa8?paM@J5zkxG z6G5}rYgWHm#PCY#B7!Ofr}OvsRE{`SuUW*gO6mNAgCUiOW(tglbWZK%EP=Dg4e=_f zl!j0S6cIdeqElwWW?B3rj!m4HZX%qA*S`;={|pH72Ed6!7C7eyH~O{^@OHkxS+3#S9lX&nov z|K}{6A%=xBzTCo@qIm;J53tSTTG;;;SvYfSESx1)7S0;YG=_z<0q3lag|q*27S0jF z!Z}}V;at(Yfn;uAo6EIuo>yeyys@!xzF1i}e>Bq=7A^ps^E(y}_~$HKFouN#UvA+- z(Y%3VVPIRxwQ!MFWZ|N*v2d|iS-5yK(-;;m0i26F7B2bES-4aT3zvSmh08?q29jlg zZ5h|X7TQ3R2q&zIC8>~5su_=7&uU#AVVo3 z*!jyLU?0vpCPNBTIjmarKPNmX%8H7jYN$EthK8c)XeHVOq3+)r3{m9#!;bR>A`a+x zIQ}}#s`q1&X7pdDnO^U&(-ceo*J+$TjU3|t+w+RexyLF^fB0LeF+KDQp@ztVDxjt) z2dagB~0#lQlY@QACwpZd1IHS6qHvKY6yUO zib4Lu$O(x$=i(?Igck%E2x($hUd*zd&+|O%KR7?1;?WSs9Qep0A;G@d>BuHhezB z=`)?)9>#H$+-a4dYrzl*^K{6-a6l08zm@G-_5wK;Mn)p!f5XM|BO|Y*|6E=A@Ux!Y z-Vl<5`=91>YBkh@&Z2BcK%ETy^&Dbl-5$+l7&SUW%I3}!i1V1iP&$wh9tjSxQwjq3 z4Ehz<0e%YD2`6rvs4}7=5x(q+I(H}D8TeqX(t)@w9P8mY2FH1%Om?`b8ASd0Ctncu z=Tz}KM7Xwu^9C0+?mPEFl=JzWGw@k}d(T<8`VR{@&j!v2$ot)$<7njl%b>%Z1Mo$N@;PiO8<;aLch>XA zwXF=1aBY(>MyS|Ygi6D`T{ZyH6h;a^Hf6kL7Ii+czgEtf`_4IbxqO!S@2R6~_TS@u zF;Q0aLkV2#`a+-A2~i?9&Kb|0aOY_yIZ6?oJ|#-!;?yWjbl4yH)4Hwc5C5N0`WNJS zK2-*k5oJQ2zex3bj{l3;AMBGEjx4XqPFbPeY;a_MP4)j@yypL&^S>7O*8=}q;9m>; z|7d|6uWh8v>DHXz}wXe|1kr zUAamxyncU`_tnN%b~#ju2TZEE9IC|wCe>XIHR1u2nl6W0@qkHfmqVR+z@)Cr!C9U2 zx_|Xu1`S?24-6}L99uMs2TU5f9Gb)fCQV%q&Ef%*V3$Mlc)+BE%b{gFVA9Iv;H;#2 z-M=<2gSM}o2Zn_#jxE~7119ZV4jtkFlTepK$9TY`lglA29x&2eqx510&bISh>lOoq7}hQ|XYBU}z6;{lUVE{D!R0V99x$2Ya+n+sm`rgwOpOOjrnwxZ#{(ua{w5AH<6Q16H^=Na=X>=d_Z*kQ z+<3rbp37l=JYcfmZ{n~p&gCwObB@^EA&cW&?vgm?h#ixqG0I&Q!}sD6md7H^i*vp_ zbVZ!YT^Z*bFK6J3T@|C;)iHd&G%@v>Sfq)WBX+*EaV~dVoO8sE$@(~#yCKdwV#j1- zoXg!5=Nz$PvN_J>Zi#b_*fH4}qugyVd@n8`A{J?0ob%FDz5$H-PLK_EVxqnl6fTyoRIb#n zG_JI+^mAnbS0;32B3CAMWfE5=b!9SFCU<2DSEh7jDp#gF>(SuFT@ftgg)F%IvPp;mVw@%;n15uFT`gyspgW%KWY@;K~437IbBxD+{@@ zuq%tWvZyPIxw5z`OSrP6D@(buv@6TFvaBo1xiZL=&gvg<%N^nU3KVeE_qY%Q*jc0G zI=}*cKCEEfk`FuI4g0VktYz}ygs`f~hZDp4CLd1f>_q6e<<2+A30&yll(72Ab%0aD zIw&7b3oD|0IKA&%-{r7Rpu4*P!~pid_l~XuoEb{>;jHitqz`9@8hkh>tgG_j+)$ej z=Y_RaKAay`UHNc;_uFHqu0ZGOQpYVvu)ZpT3mse(7`YB`arhe2hf4xGA1;mjqj6ba z>I)Bo^;|w&0akYTa3xsd<-=8AwU-Z9gLPj%Tmx2s`EV^*3+BUh+*M)VTkd>aohLfH z0jv{q9fUW66=Oc!1lErEa5Gp%=EKclJ(&-;bW3XqtIK>Lt-&5X+}4e43+v8&A??6I zKHLG;qWN$~u$B*pIXgc(ZaG3-yb`|Ib=-0UAIFz)p@Vz4Aw6Ivo9iGX9M-h?aBo=k z=EHqqrJE1;hc$0LJOEa|`S2hV6paU$i+tGcXyh{q`VG(m^uVK$Pk#dardJOE{RQ}k zfj$p<1n2{xM}giCdW_dU4)iwgPXHYOdXm>a#p|Eu_0RD7XMx@h>E?jm0eYS{et|cB zk=MV(>t66b|s;1$_nlw~j{M8x0!b?==E_2XxJ-I{?Nm-&#ng&x_h` z!0GLrUe4*=oLAjp@%jvD0Udrj6oE-?9y;huF$mxBYUdQQeoL={20*!s#VEa5%k!(;GOwfYbW3!Qr%ar zv`y@`N2k>}t<7m=PV2&MyK-6&c3X_oI-FMFv<9aY1i?`rjtcm9{7mMQxn(udMuw1f zq&?|KI*~4gy!LlriN@c~iwyFcnQzQ^`~_)lCgk)6_O~O+8b`)R$e&OtaLK_RHtz z_Axlf^T&7mj_n;=MZj?rP6F(R!4^0G_GqXL`yeqGk7D<1^7p6Wz%j}ZP~Nc=P?XQ9 zpSfJQmvIzx2|lk2ax@w4Na{)_C%EN~cy4Tl`?mYh$osoM_XNG$i3aE02O-sHPt^TO z;I5^1zr5;>;ID3#@$+kpU%bM&bo3hI^00?hMcAjRGO7Yss~T)LQv)`SsResk)q%}# z>cQSt4Pbp-BiPfb32f`q3hABXM>zx@CM!4a;6__Q1b@t@iY((g7=hz(Gb|VY#17jMxc>s6dH}jps{Ei8jmKR ziD(jvtSRcIcP4L2RmskKnu|#v=}WxOVKhg{0i9pY!zCK)}Xa$ z9a@hzpp9q~+KjfKt!NwEmD|w{*g7h4NQ)u2I2BHf)8Mo?9Zruk;EXsE_F#XU z8E3&+aW)^V$9@J74|Z^m2jR=f>I;O%$^-ideN-FOe) zi}&IE_y9hL58=c32tJCB;p6xOK8a7^)A%iX2A{>}@Z0zud>&uG@8b9H`}hO=A^r$o z#2@2N@Td4Qd9eFeyTcl47JdDM3n-QlvB~L&}nJB#4wJ6-Y%=iBu+4NL5meR3|k^O;U^0 zCUr<%QjgRp4M;=Mh%_cmNK?{`1e4~Z1!+lIk=CRQX-lF;q7Ed~9gV_BXLm&EM!J(8 zq$dd{z1-2MFX`uwP6Nn5cZ3>DhLE9T7#U7Rkdb5*8BNBJv1A+>PbQFwWD=Q7rjV&* z8ktUJkeOr_nN8-9xnv%hPZp4cWD!|RmXM`n8CgzNkd$qurU>>|6#9mTjUHmOU{wE z$vfmcxj^0}?~(V(2kyuUBP#iXd`dnem&oVj3*XpEz9v`6HS!JlmRu({$amx>xkbJw zKaktx4*8MXB|nj$$uHzra*y0656ExiA$dd|li$e`@{~LykrYu(38j=#P6d@zQB4iC z)Q={h327plm?oh~X)>Cerl2WlDw>+6p=oJ4nx1B$8EGc!q5d>8%|f%%Y&1K~L37ev zG&jvd^U{1YKP^B5Xh9lC3(>-~2rWvB(c-iOElEq!(zFaMOUuz9_vxS_twbx+DzqxC zMyt~rv?i@ZYtuTkF0DuF(+0F5Z3IscO=wfvj0V%@v;}QRThZ3E4Q)$9Xgk`TcA%lO zBke@PXlL4mcBS2DciMyYq~Wv|?M?f@(?>se{&<59pabb3`X(JrhtQ#P7#&VW(2;Z$ z9Zkp3v2+|APbbicbP}CRr_iZ%8l6sO(3x}=olWP^xpW?#PZ!XIbP-)lm(Znj8C_0S z(3Nx*T}{`}wR9a_PdCtwbQ9f7x6rM08;zjb=?=P+?xMTt9=ezAqx1Xs3{hWS5 zFVipS75WwZnqH;X=r{CRdY#^&-_e`&7X6<7KyTAK^hbJ^{zQMKztCUlJ$j!$puf?F z^bvhbf2U9AQ~HcXGQ=<=j55YJ6HGG2G&9UHKbC+cWQkZ}mV_l`$yjohf~91sSZbDr zrDf?@dX@n;6wAas%%5duSy)z&`%B%`(PF9UoXEk7hvRbS*tHbKDdaOQcz#6hf ztTAiCnzCjrm^EiDSWDK5wPtNtTNc9FvG%M33uPTyCl&CjX9;_z|XT4Z& z)`#_F{aAnY1{=TzvO(-kHkb`zL)kDkoQ+^3*(f%ejbUTiI5wV5U=!ISHknOfQ`s~& zoy}k~*(^4j&0%xdJT{*#U<=tIwwNtpOW88EoULFh*($c0tzm1~I<}r|U>n&cwwY~V zTiG@i!M3v?AwIPP4bz8FrSPV{fx} z*m-t=z02NX@3RlshwLMEk$ucQVV|@NF>{mg!0zp{JmK6}7^V-MLQ_L%+7p0KCv8H?nIV@^2bjB_ry z5FoKwgL!=0$i>UW^y#C3s0*ikIePcv)VK2l4W}0bwT8$!qc2ybiC+>+$-$0dL3~@y5IfZ_1nTVBVa!;4OJ8-kP`JZFvZ9 z$J_G`Jd}6jop>1U%)9Weyc_S%d+?q-ocH3rc^}@F_v8Kf8+-sC$OrK^`CvYT59P!7 za6W>M-c)Ufp6rS_-4L^Z{^!~1mDhg@SS`Y-_7^%y?h_v&kyi} z{189PkMN`X7(dQW@RR%$Kh59bXZTruj=#;{;ph1U{w{xyzt2D5AM%g*MgB4Wgn!CE z{09Gy-{iOW_xuNbo8RF-^1J*e{xkoD|H|+2 z`}_g_jX&g%_+$P%f5M;gXFL)n>#!h#3MRM^LJB3cFv1Eykw7FAi9}+NL?ji-L~@Zr zq!g({YLP~y73oBJkwIh>nS@99i_9X6$SSgl>>`KADRPP2B9F)`@`?PSfCvx;MW84o z3X3A5s3<0iixQ%wC?!gZGNP;~CxS$IQ9)D`l|*GxMN}2lM0HU^)D*QuZBa+m74<}Y z(Lgj5jYMP7L^Ku6M6hTsT8NgSm1r&6h_)g`v=i+`2N5bdicTU-bQWDiSJ6#$7d=Ez z5iWX(-lC7_EBcB4;terC3>1UJn_{pSB8G}#Vz?L~Mv75lv=}4Cig9ARm>?#KNn)~? zBBqLIV!D_iW{O#2wwNR4ig{wbSRfXPMPjj7B9@9}V!2o$R*F?(wOAw8igjYW*dR8F zO=7dyBDRWcB0_8zJH$@0OY9bV#9pya>=y^bL2*bN7DvQUaZDT+C&Wo{N}LvNi8JD? zI49l~?}+o_f_PWFC*Btyh!4d_;-dIid?G#-pNUK2bMb|^EWVVNkWwnCrIA+p$pkW?Oe7P_B=9$TGMQYakSS#kHh9Hm3EAz?xvVaVb1!bTtBn!(TvZyR3i^~$Sq%0*%%QCX8EGL6x zd09bLl$B&_qVY0LABD>0Nvb*ddd&+RxOZJw1WMA1&_Ltwt0dk-mB;S;S z2su)YlB4AqIaZF7*WTyQErl(qz@~}K2kIG~6xI7_G%2V>Rd`q5@XXQEhwtPpPmlx!_@;&*!{6KyvKav;a z$Im}W!L|P~>gvm@@*14ixAMBYA-|J1Fca;e-ZkIJj^sr;&d3Qz@Apem#at0Jl> z{O?4?RS8v6l~Scu8C6!5Q$eb{s-P;WN~*G|qN=KDs=BJ7YN}eQwyLA*s(PxvYM>gb zMyj!DqME8^Dp)mFEmTX@O0`yPR9h9I+Nt)cg9=q0RVNkpmrug?|MS^ajZ~x5Xf;NS zRpZonH9<{OlhkB2MNL)H)O0mN%~Z40Y&A#CRrAz*wLmRYi_~JZL@iaz)N-{#tyHVj zYPCkKRqNDxwLxuEo785tMQv5vRD{~DcBq|dm)foNsJ&{R+OH0%gX)kvtd6Lo>Xy~)J65N`b2%IK2w*}=jsb}S$(Ol zsIS!5>Z-b?zER(*>*|L3PTf?u)c5KKbz9w0KdQUxC-t-XMg6Mosr%}I`b|AlkJMxJ zyLzIYs%I)vBaJoDR5Q)B&{8X{wb54l=>$5VPNWm-Bs!^1rjzRwI;BpfQ|mN3txl)Y z>kK-h&ZIrsUuV`?bXJ{BXV*D&PMu5V)_HVZoloc21$2Ner~`E&U04^k7J}uB0pLD!Qt!rmO23x~8tBYwJ3?uCAx+>jt`^ZloLQCc3F^ zrh|2J-9oq2t#oVMMz_@=x}9#XJLpi|QFqc|y0h-0yXtPbyY8WT>Tuml_tt%MU)@jl z*Kg)6?|~JyXxp zv-KQ3SI^V)^#Z+6FVc(k61`L})64Y=y;85ztMwYaRSOx2KA}(QQ~I=iOP|qa^*Q~ven+3z7xcUO zJ^jA^K!2z|(iio|`V;-B{!CxepX)F5W&NeTqQBB#>#O>j{ziYRuj?E7JAG5%(%;s-NjdgA6vrP{Ry2!bqcxHpW=v zXA+o%CXq>Ol9;3>nMrO^n3N`!No~@Yv?iTNZ!(ySCX?|Pf0Nl{FR6g9<6aZ|#SG^I>wnDs3S^S(ha^Xts}R)QT`tHA89 zZ|=7i%>LGK=YQ*)2Bx8DWEz_$rm1OWf=zSN!n8E4Ol#A|v^627ooR16m{8NvbTVP4 zv*}{Gnr^1M>0x@BaMR25HhoNA)6eubZ+-!_5dY(u^{r%@{M* zj5FiS1T)c0GLy{|Gu2Ep)6EQ+d!A)xn>l8#nP=vk1!kdHWEPtxFeAOpEH^96O0&wW zHfzjUv(BtH8_Y(t$!s=T%vQ6_M40VnhuLX%ncZfO*=zQh{pNr3Jj+x`; zggI$WnbYPibHPt2$0Gjqv&ZoV*=&6nni z`O184u9|D+8}qHXZf=4aA)E2YFZ3$b_ zma?U78C%wtvq84JtzawKO184CVyoI}wz{ohYuZ}2wyk69+IqIWZD1SPMz*nSVw>7# zHrO_|Eo@8M%C@#`Y+D;*+u8QEgAKJEZ6_OMJKHX{tLfwu}keTyWFm@EA1+~+ODx{?K->OZm=8eCcD{gv0Lpn8)3KG z9d@VPWp~@X@H=D=+avZUBIG)rj^KR&%#FD3L8COuERFL%#yhPKQ})9lNn$hz-gv?s yJ-G7q>eWI)$P@WA>i=MniEs-DcHa=tG^`F_kIxVK59j9=8ucatF8iN;=>Gvi#k{%z literal 0 HcmV?d00001 diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index f3ef71a..3f8f1e7 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,19 @@ +2012-02-12 Timothy Hatcher + + Web Inspector: include failed and canceled in FrameResourceTree. + + https://webkit.org/b/78445 + + Reviewed by Pavel Feldman. + + Test: inspector/protocol/page-agent.html + + * WebCore.xcodeproj/project.pbxproj: Added Inspector.json, Inspector-0.1.json and Inspector-1.0.json + for quick access and easy editing. + * inspector/Inspector.json: Added failed and canceled as optional properties to the object for resources in FrameResourceTree. + * inspector/InspectorPageAgent.cpp: + (WebCore::InspectorPageAgent::buildObjectForFrameTree): Set those properties. + 2012-02-14 Csaba Osztrogonác Typo fix after r107707. diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 4cbebe0..dec174f 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -7379,6 +7379,9 @@ 1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLResultSetRowList.h; sourceTree = ""; }; 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoaderMac.cpp; sourceTree = ""; }; 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageMac.cpp; sourceTree = ""; }; + 1C435CD314E8544F004E10EA /* Inspector.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = Inspector.json; sourceTree = ""; }; + 1C435CD414E8545B004E10EA /* Inspector-0.1.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Inspector-0.1.json"; sourceTree = ""; }; + 1C435CD514E8545B004E10EA /* Inspector-1.0.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Inspector-1.0.json"; sourceTree = ""; }; 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButtonController.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 0; }; 1C4C8F000AD85D87009475CE /* DeleteButtonController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButtonController.h; sourceTree = ""; tabWidth = 8; usesTabs = 0; }; 1C4C8F630AD8655D009475CE /* DeleteButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButton.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 0; }; @@ -14058,6 +14061,9 @@ isa = PBXGroup; children = ( 1C81B9590E97330800266E07 /* front-end */, + 1C435CD414E8545B004E10EA /* Inspector-0.1.json */, + 1C435CD514E8545B004E10EA /* Inspector-1.0.json */, + 1C435CD314E8544F004E10EA /* Inspector.json */, 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */, 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */, 59102FB914327D3B003C9D04 /* ContentSearchUtils.cpp */, diff --git a/Source/WebCore/inspector/Inspector.json b/Source/WebCore/inspector/Inspector.json index 5451f3d..91b2adb 100644 --- a/Source/WebCore/inspector/Inspector.json +++ b/Source/WebCore/inspector/Inspector.json @@ -137,7 +137,9 @@ "properties": [ { "name": "url", "type": "string", "description": "Resource URL." }, { "name": "type", "$ref": "ResourceType", "description": "Type of this resource." }, - { "name": "mimeType", "type": "string", "description": "Resource mimeType as determined by the browser." } + { "name": "mimeType", "type": "string", "description": "Resource mimeType as determined by the browser." }, + { "name": "failed", "type": "boolean", "optional": true, "description": "True if the resource failed to load." }, + { "name": "canceled", "type": "boolean", "optional": true, "description": "True if the resource was canceled during loading." } ] }, "description": "Information about frame resources." diff --git a/Source/WebCore/inspector/InspectorPageAgent.cpp b/Source/WebCore/inspector/InspectorPageAgent.cpp index aaf2606..00ad39c 100644 --- a/Source/WebCore/inspector/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/InspectorPageAgent.cpp @@ -763,10 +763,15 @@ PassRefPtr InspectorPageAgent::buildObjectForFrameTree(Frame* f Vector allResources = cachedResourcesForFrame(frame); for (Vector::const_iterator it = allResources.begin(); it != allResources.end(); ++it) { CachedResource* cachedResource = *it; + RefPtr resourceObject = InspectorObject::create(); resourceObject->setString("url", cachedResource->url()); resourceObject->setString("type", cachedResourceTypeString(*cachedResource)); resourceObject->setString("mimeType", cachedResource->response().mimeType()); + if (cachedResource->status() == CachedResource::LoadError) + resourceObject->setBoolean("failed", true); + if (cachedResource->status() == CachedResource::Canceled) + resourceObject->setBoolean("canceled", true); subresources->pushValue(resourceObject); } -- 2.7.4