From 1c4d466c4e609f17a20a1eda5ad92ac1b0d1531d Mon Sep 17 00:00:00 2001 From: justing Date: Fri, 30 Jun 2006 22:17:51 +0000 Subject: [PATCH] LayoutTests: Reviewed by levi * editing/pasteboard/pasting-object-expected.checksum: Added. * editing/pasteboard/pasting-object-expected.png: Added. * editing/pasteboard/pasting-object-expected.txt: Added. * editing/pasteboard/pasting-object.html: Added. WebCore: Reviewed by levi * editing/htmlediting.cpp: (WebCore::canHaveChildrenForEditing): Don't insert children into object tags while editing. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15113 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 9 +++++++ .../pasting-object-expected.checksum | 1 + .../pasteboard/pasting-object-expected.png | Bin 0 -> 16478 bytes .../pasteboard/pasting-object-expected.txt | 23 ++++++++++++++++++ .../editing/pasteboard/pasting-object.html | 11 +++++++++ WebCore/ChangeLog | 8 ++++++ WebCore/editing/htmlediting.cpp | 1 + 7 files changed, 53 insertions(+) create mode 100644 LayoutTests/editing/pasteboard/pasting-object-expected.checksum create mode 100644 LayoutTests/editing/pasteboard/pasting-object-expected.png create mode 100644 LayoutTests/editing/pasteboard/pasting-object-expected.txt create mode 100644 LayoutTests/editing/pasteboard/pasting-object.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 9a11cdd58b9..b9eaa8f7202 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,12 @@ +2006-06-30 Justin Garcia + + Reviewed by levi + + * editing/pasteboard/pasting-object-expected.checksum: Added. + * editing/pasteboard/pasting-object-expected.png: Added. + * editing/pasteboard/pasting-object-expected.txt: Added. + * editing/pasteboard/pasting-object.html: Added. + 2006-06-30 Justin Garcia Reviewed by harrison diff --git a/LayoutTests/editing/pasteboard/pasting-object-expected.checksum b/LayoutTests/editing/pasteboard/pasting-object-expected.checksum new file mode 100644 index 00000000000..db7dbebb878 --- /dev/null +++ b/LayoutTests/editing/pasteboard/pasting-object-expected.checksum @@ -0,0 +1 @@ +ddb47168f0e155bd53c873769879386a \ No newline at end of file diff --git a/LayoutTests/editing/pasteboard/pasting-object-expected.png b/LayoutTests/editing/pasteboard/pasting-object-expected.png new file mode 100644 index 0000000000000000000000000000000000000000..1f51d8e98b73a93cf0d95686103c10e47614bcc5 GIT binary patch literal 16478 zcmeI4XIN8fx2|Kw&RQyhC}2UP2rNKAN~>d(V$f;+YpDk%8hMVVZAZr~HxzF#A=ME{71-bFh@!I!&s9el0P6M;$j z5HO_kO6lMou}5~Hi;MvCvGB--hS*46mLJWG<)10;v$0;y=<$Zq)o8iZ7xf&t?Qj>U zBbQ@mwjzI7n>^u<{F(a%h5Y*i=hj`wKW%rNK>o-&>5u&J-~2MY1*M~{ov@AN!1frw zrHLCpG;)Mwsj98Bi%X$1S%kJXy74rt@xbYONKAvwngk!9Jt<#)!5 z;wsuMV4_EE;+wBGb-8@J7GqnR)i7kxFS#$30=?nT_%$2ogJ zcR)5q(XYy>)HGEyR+djxlvuZZ=&a`3Bf`cUs$-AYvAe8es~B@XpNmGNYD7OVO8h20QO`|!jDMd`-HT#|i#a z0b$_|KW3Mo^-OP}=9T>=O*bjKitJVCa5H*3I`7ibB=kEfy;gJUhLf|h8k~+2JoksU zRjFj8)?v7+mM8kgKGHAp+iUlf=2q)0)A5fN7MxXe)YXFsFXeU{m}~ZBYx3+X%z99B z)bA9Rxu9)-$$N)V@)0&RHtXI3YyGk6#U?pU@jHL=rr$_X(H~=EYLR^YeExiIdh?am zxbf#xOYVebyR>DK(DlM{N0}y-(&Q+b>E%2TKm1RxeY348*Mq}_wP`lCLByuDamHXB z?oqYRF011~m+@2lt$9~;{5}pIntFe(wfS?YXM-%}%LU=N=jQ9DCe~q3)33hdj+=xV zM$<+^J;!6++Y>Hr^I02yiUj_~V*KXamFXVil6#4rL~~KqC^`3>s?80rSa}Z}9`Csa zBx+gJLYUJg@WOiM6VimN*gY03Xy;H$t~($$DpFcUT@(o<1+ z!lx0H+}&;Hv($1GISF5wWzK#!omr6wxMY+4m=yE4qJ8ZmitBUAAL!0gIL*av9S?Mk zd}uEuUbiQT@ePg3y*lPla*5>2$R4~uvL8*KND6%ZJk)jUMA6-rQ@?_S9F9?%D&MG4 zJFAI5Y}XL7b=93PPxhXqhEu+|?^`~ree^UJkFxdZwe80U4+}kb@mv!n$G(?Mb!4*Z z#IDKhl(z3ZKbrU0S$+khAdrWPBF4lVZ+t7Jj4Y+v_3O(`a#Vg15lzR+ztvFs4qAzkmNO#&Y2JACr@lmhEXbYB+FEZWXIV~r9wZrs2U&D;m@mYrEf@b+qIYU*7%W*QLQkax4ps|U|J^mn^Xcek7~ z%>8i3($b)`z`)eh4i40C>7$ie#f_GI-16Pjm0+<{i~2XIP*f~i-d(XI*M+C*XBt4F zlu9iqXy?GGKR+T|A;P{o)7Q1{sQ4ENCd5ZHi8<>IA6m8cbMNWzcPuO-9jjk=VRD&paTU(QO}l(S}~M%*=sucNWvZ2wk*+gA2);u)0F& zYDVst1K03I*d&NIA5Sr;WeyZO#+SkY(V%o@H$L34SN+zl#G{bOO4oiqZ%kGVRrmF+ zioD?T4zm6jgIdjMtoW3bM=ApAnXam(CC%fzmPi|mc5JYSFtePkT*X#14r^9dk>8l8 zySWvK)o?()(b3gy43-|e8#GUP>OR|lw4f@6ZkS8^IQ1bttIE4J@*d^K+o5 z1|ed_ZOewYw|FDn2R&*f9BB(=%hqJovBhRZ>5zs3>$V`VkBoS#0z88)vC=Y1()LL1 zK27{+f!0U5SMINn)x_N;)A3U;hhMx5mkE}unwf5&{n#sP82!|wOR~pdxbqnlpEQfT zc^f3JgRu|o7g0MgRA^DH_C>e9Ba?BxDM}A?=tQO zDNojQVyH9=zrN-))BRrgdW1+g?|>Jz@{(w{zUfr7v}0V5m~pvVHf&4kSYx!1sHm20 zXO@$x)mPb118xvC!fj=EiYx5yby=6A&ZFO68&}+a59yrfFi<9dMw>xaE%i6i0Gg&C7M5#5h-m%=BdZ28eoLXhFZRb91BDQkr(_YbuOk$OersfM?fs-dc zQgrS@Ua3sAYL3fJPUcl@B}bU&goPbe)iE}XBH0IXh$+=ah_0F{Ot%qUDnO!XCfC6U zZ^ozzZns&zIYTDq6giT(?|GOfwkJ`~{0yADNi{2VPJtihz~>l;w5RKyg+Oo2tlB!` z*jHrV0jajok%SFkVKq=vdbsnz@ifP3rol_ajgpX%5I9g5j^dVPib*@O;3hK>kjA0w$Hq*N!+m@hk z#LhQY_MTv-D9MShU)GiG&Ef(DQt-@~uN1Y~praD&gWeojo3z=0Lj+mp-m`=aZaZ%o z9=g}#o4C6cAM5z9NGTZnd1soH*RWis(4z!z7CK{~i$AE=qa?%4B52NAdmc$Bt)P9< z%r_Py=(J|P97;~PW=~I#?7bm>H|pR_x8?)-{RFXhw|TtByY&3#*d`>{vR<4zn)F%b zsZ++{O{Q?W%Qv2SF^XO0JW7YA++X5^V>^8Keq-j__?VciO94BrKlpDc+uUGuWatZB zxq4MD$DK)EhCHNWY8vzN=g;<}tE}0E@0DU@@y@1J$$dF?ZK)b+s;W024#o=u>r4BJ z9V1-F{LSXK>@E-`R<1<7;8D!U$~u>gtu#i;#*Y~(yY3&0n`{v@B_BHzc=Jlx+xeD_ z@+`uBvn3-3$Yiod6|Tf(98@1(E#7v(#Wbuo86d-e?5H*e2QD07>_eH>%S4A8EdsxNN(l>S*;f%E_(>1xu|mz^)T_P;%;4W2)Ko@Iu~u#M zN&Pe13)IuODB)omg0gEd5s8Rt3mC?A^A$HJ{BFqF? z1DhDF#)JpB17<+*5;wzqc$D6-5rwAW5k1@I=I+qz<8T%ZJ= z#?ST}LDi~jYU+G;=VZeRtYaJ1$|BTgLgaocruP547gHckeRxiLiYdFh85P zM1hkisHj+7=M}4YKcJ&fmuIh(q9NC1I!Yf5mU zwnPx`R)7q(1yzQ%{=tz1^;0G%|2EgKLwVlPl56RJgZ*Gd&!Vw|Lrz^?-PXY$6Sh#Q zIpy54u-@}mi0zyi%1;kWKIQTK5stx5dSw5kpf>uw7aPmK4i?(=h$A92-j|*}A_e{` zhqgFQA^I^hRf0KFem|{pclguey6@k2Qv!IhDl^Kx`Ik8+L@$3FjDGVb6>e0Au}WPP zRJLE2JlRj5Kilsc8x@sNQ6WDwP%b@cf8n1?s?&K*ul*KpJQWms^ElBc-;z_x?(Gp# zY!(!3FOfw?#w>?+q%N1tj4nSD-Mx13MScs3IWPU>iEhoc+S({PNVo=vY6S!eMjT2g z3vAZ0?RR<}hBssI#l`MaEEn2S4`YT8$H`ssj2q2Nr7QmtuBa>7!N+z==4pDC^Ix$W zM+H}T#c)ePguXJ9 zY2sMf5jyBCY14jWkwyKsv#JOzrPCMKhP$5L5OrCx1bpTsMx1PnmS*v${zz2TCunjZ^$&_@CwSrIiKLfPP(EGz%_kdh3xdTMC#U!Q z4#gmH(TsDkGojh4x+iIU-MhKWr|)ZePV7H4 z(21}-dWL+{Ba^2-^d+ZtZw7sXK@E?NrbOnHjNe+D8;w44#>&AAv zx=hE75}YgV_#Y3Z2)OqWWarAhQHr0Ss>O%P5&~QFP z9d4}=_TY|Y%!T2|>YE?89%5s&=q-X~=NeazNk9HrbNDX#!aL1{CSlOe8dGLm{ znA?Y;L7pU5Z^%w~v5T1A)zQ%j;thTC#u5@Cd+SCH2>RsIR0Oz0X(=+>y%8}B8dN0& z5$!U*>m?p5JyyZI60Q^4E^|X4{Tbz+%QkILCPJg4Y(PRfx=nZA5~*6deTaw0QDI{Z zhf}}9EPFRg=^{G9PBp+8X!PH*O?`ECpb-kpdeL)TGr46k0_|h3yx}jGDI+6ut7G`} z>8lTYt9&YfhNS}VN`(W4>{DD9wTvQySgjzLMH=8X!s|Q8+pg0V13Je+)mE(B0_~X! zCL3;9+#-t3^=bQJyRKGbl@B8d3e3}X z%?C}^-nBBMk%6l`K6)0uct(IIVKL+){_uAWu2~uNTv^sm(!^np^>28iMa zBo4}aw#g)I z+C#eh-PP;Ll`EGBpNEN+Ha4`I0IVFn2?3SG6&3xIi#MV_WyjZ@n(2ZX9k&{%;3J!C zzav8w)UO)PJ_DB5VUowInD6)$NQt}L_wA}le-X1HVCcsxRdxBN-I6=*;mgF~H}7Rf za2iEkxo(*biU-Ig$0p0XADf(&G%C`r8y9My0Zq|^khs)@gb$-*V{|h`Iaq>yNNGCtZ-?u`@-1@Fo{vpj@a;84H5Gy zQ_x5qfQ!7}s6FA?OHe2RJWM~~AD=8@RyI*a$!UZ9;ac?E85=ly{E4ihVoV3&X5xyO zOQWRc&;yq9cfS3G2Vp_bitmJ|Yp?e6(_Gg+9YgPiyfGPo@^!AOuSc(HoD?69`>Z`a z&YI)DzCGrGlM;BU7SK(|EZTsL_Sv9~Zy7HiaF~I>?ku7v=jQ%c%(9JM z9?}y{LBcP^0*IybJ+K^>Vnu2Xa*g>hO2$Y><%kSh(}UeyuY=w{lIwvVkKdCB+)fu`%EU1k8awY>Zb_Otx3Cne8uC z)6nP`{T`}pJeY3UQHZNO047fZ3fT=HCrlCK#6h+c5EN9?O;w){%fwcCI+vQ#Kl5xP zfHG3GQt(Ss2}UR@aH-%w>keBhQo&$?-XcdHXlM7)C%mxDFo%WDuNU+0cWu)!&bJJ1 zZEe*vG)#j?xj&YYoXjsNss9qa@)n46#^~s%v9O&5kOKl-Wn<4os#=%mQN~nj%JZD+ z4bQJNHJ!#sW6s-kYl9uZ0H_Ol^=e4qIz34L?fECkQp$rvJ*Q^GO`LBJN4mKjbXH76YtOl|V!Q5zL zTnz}A=c~=~i$UTN5*9%%kWA&to>S=rUR7{fxa~<+7 z79+cL`HFc*`bg9iI|?;4y=PL$P$TMm3vd`>=vl2P>1tZ=__E(7g9O_f9_P0~GZwmO zQFYe-{rmT@(1k^nB_$WCDWamH5xif&eBl?YE8SyDQP_mi#19b$^{xxJ&6p$+pfz@L zId+`7e9@b7QoC~dNO^^B-;Q1tBO@cjzTlTHSu?W=2MD~dm4Xve(8f3m0RutSwb<*k zIzWIl4m{EbTMuBFQ3e$tQ$G%(JX*@$73!m>2Fuj*stn!Q*Gp&=>Yl@H8uzQroHDiQ zO(u1DwR+QRbFEg9SCtjL^a^D9SHb!taKw;D^Ia_`S%ct14!tX!AXTfXBW>@l?5*6O zQ$mt~`kJ}*Sa6~}T|d}2$I4-#gmlDjES<$u2M27i9v-C#TQqZRxl*>iP`?bItjkzt z&)&U~U}n&a>3n!$L6Ke0!Gfl(;S5j}oBGS9x-#@L3*et-PG8xgWL#2lW_q1P z_9pP#E+M-Z@ZNA3A&bU=Ear`!WUztFrGZ{bZD>$u4zv3GaA`&p0NdF27JR2}$Sp6z zKBs|4!nO@BeZ7f4u4%rnsG3^6Sp^zmDbt*(R{N5tOO9HR1g{x@6W9wVFj>N!t9+%` z7LA97<+)wsR&CD%1Aoyycu@nQ>mbZLs_Xxqh`yCjbRrenV%i`LH?Ko02RSN)O)08InbWge0T~Ttj6%7LuLH2lyl;+LDu#-{NXt z?1&xL0`2|1zFwk+V-a$o2L!ld-0M34^X-6e3@sB801K5k&LXymV!~S0rnxNdxpY^; zd+i=^0SsVkfg@=UI(Xl*OiNn}Y&z-yIM#%{d1KI{0y5va<=tcGr=X$fj7 z4i9$U621w>FwDj_tm5e-1C8XsMzgCR-T|{#{jM! zFvg-#+WDV6_ZR?8K$1HoWrW&8*MgYWkY`bkG*AY788abG-UGM)NgYL1)vjHeqjO#X z;kL~;`{&yHNbh^xQ&81{s)&`YtZGGy@&Jfl#O^_hitJ&mr4fOH1ZiC6nm+Cu2*qXq zjQ19bpmynaWAs^EP-l)=CTveS=td~tZGey-HZ7i&lInCJX#iOvSr}v+BW>Ge3W-&5 zeW*~qq%ZqinCF2}=)QJBPHl&(UOD$^FIY}uSZL^oyCTb93^XJxENqnaoK_buROrKS zGxJ&Q2uTK%^{aC?%NiwR9|h1+iC(6Y;QTm`DBXWA031Z>*|_^k(3bAp#wtHlg7$N$ zTsD9ldOzo(_xgOTCw-C-9u+lJ`Yr^T#c+n&7P$!vP*XLa5rI^Up^pKQ&=fIq{(c7A zx4$sH_->1muyMhh`qNf+p}l&wa3ZyPao{bCtGr9cDR-b~3hH@h{M#%*3qXnqnxHul z+9&&t{xn2(%H@;qKF8)bG-653d}-vsXV22b5ljTEZ@z4IA^2w4s2zN!P_#JD-+i@n zA4dXI3ItH*d_*Cg&-ZIaPJC`o?+7c%r z9Du&Gf)_)dv}ufzoEoew$H+lv1nl~EiAvW=9rS9yOI)bU*#~uOQ&rI0c-~v?PL#z@ zjdox@JAK^2p5{&+MDP_T_4Z`dLmj~U0Nixc^7v)JbirLxl}{No-q6(DDc-wx@7C|F z&eLXiz(OeR;e4i;k+~brBEGWThGRO1NJ%vkO9#mzf)OI zs9okA+iz$9_^1O|2f7TF6z-ZbZ0f^>(g z%mHrsiB+-BA07T&#>|4Vhww-PW}^RwRf;I3Z&fa--)wDdonc;G1q6@kz5!6B5KdI( za;FKskF+sX>OKr76T2F)<}y>*Wdjxz*kcT|KYn+P^sZlq4EDHy2&EkMw*@I|1CZZu z4a}MM*cT6^0xLI!mSp?LOGS~%hTY51Ie7}f7^erv!+_{g5a>5z2#a%M?=qw!266*McN==7;_V z0%v3~m}6Fc9_n!=#DG3GHR?a2G%vEyLCCIM;29-d#?+g)9X=(1Nn^-@s1!CU(}QO5 zAwKn8wqD`PDNHpI;BK@1lQJi%&{Bq$d=ens{m^%_rA6I+4$)EUFyIQ2^{DjfhJFqb zA!!UbNc*5=&5;%=ED1k?dG@l4=xJ(d7V->&;Qz$#hJq3UVLQJ*^`3ZA`AHgNDC76H zACDJ8YnC6D2^1VOQi);UPxYYoARSrY4J@XlmZYna?z5(7~vqhl`D&^0)4dQ0%8jq9tKU` zLT7V%sZEO#a$RJ%tf(p5^1bQq_kxR{1}d=by$)p0x!40Kaof^O9fdGC$UqBv)kANv z2C$Vr77Huw_I<|97NQJ9T!@$oY=l0b=kvF}?3x*@G(i9tIE^Wf%XZMy4-!L8Ez-(I zg6>5%mM6_Lahd`(!S(x@2>#Qjl@Ylki?_LKP77@^wU_|^16`a6whE+Sfao%Pr7Qeo zAt9m6g-3bU=rnNH$;}FkbMKfTTYp7ldzJftPv&x_Ar09=<4^Yf+|4fxn3OvH$fXtl zWMAWFRz*ABNSG)H4G*_~_13c}1veQ94WCHGOU* z)2Baw`SRuMmFGwF%a6lmpNEwb4`~P!&{YRz0OkEfIvn%w-@g3;%PI+dwm$&oN&{Hh zUD{v6A%UOLL-2~JNCeVhh9Fz25bdte7RFX|yH2)#y(SKoRD#EE{XOUfIMi>U_I$b~ zE)r2M4?=b9%d#AT7kK*8TUvaYp z8csTKa!NYzJp9$G1n_6kAQu(IlvJ6APUBAj#3$h@;psrKojr8($yRg0R5g$DGrDWCS#YE0@KD*(q9(Mbk8FsO9 z>$S+fw1g7%t9#Y(1qpgPu2?un9LwB+%s}4T2z()XNFn4PEGZFm*F7{tEsa(4&Y0Dv+o^v}X>F^=0naFXri+ci_OqmzF-x-3~ z;~=QuGrg}P_kvoN#Tur*(&u{R#?7dphOM}Wa)RyFuhO~qz6gwKIQJw@zglhokWC*ux~vg$RMTvu6el=$lL$VBb5Kb z2K+0NnSa0S-wXeD^!=YrG5jcAOPA!#HC}!yvpT1 z7fvf_$H6SqgW*0px!LD#h+UQ;G+m1THQHyE?+a7#WLM3ErD1dc}y?X62Z#pz4 zz|QHwI34tD&O=R>y!+$CL|IN1-DW?Jg8a~V)Ot4pj_Vp4!o*ZS`n=)=CJKBrE`%5K zyOw}}Ku9tWCb-xXU}y`#4xW~kn3^60_QQ-D2F6snC{GV?wLaL!a;ldPh5Gnti7g8# zum`itJ+8WI+cTI}gn8-<`%#K+fV<)EtuW0*@tA>U&;%VEO(knS-dwDahnd3kvVYlBgn37AgP27{pF>G}Mx1=l;^0l(Ct$h|A% z%=NIixSWpxESZ3|^^4HZJY1gc(M2X#LEgP1R?#!+*g~F*lwAW2S@@m;y^)gK9RDoi zLN${2VsMu&j1>iREme3d-U(`fuGtw?Kyer>HV!Cp5^~#@x~gH`BHN@`6L?q%GTj<{ zTt){O?4d7HJ_`to$)LI8s zKo=RgXV62|0OpWsxN#pgpneG{*CRZuHegaa1!i!KkSSOU4Tdul0adoUNup4`4?pcW zfqb%t^uXwHFHpJ4R2aA+LZ<_o7pfr$&}9=c0MGN;i3yRU1H`_o@fAqla9(>-)qo3* z4;4cdDH+;|45k6GL`*z%#@|73+@1K5=m{NJ{LqIjz<0HfvB`0?CT>)+%QWfHqelri zG9X{L?^!$*d;9k7aG?_*D)nt_Y&2#>P$+K64Y?CE8VwwtPP~Fo#m3`>hyt*XK`n93kJXH?|CAmCY3Oxx!a3ki}GfvhOwTfKx3O%u;a5INu2;ns86jMzPhXLk7 z7zkUQY`fYTDZ~lL`3A76aUnf6o7+L^8XDj@<5p$|j=7cs3z&SkS7evVOOSd;bWk!r z^a5U>mpJ_~*c6XSWCFwZzaAptjV)EpTOd*l;<#ZV6&V4CjkrJN2xB^c*^sfQ?d2?} z@to1oJ4kqfVqT&fcW}A)C)SIUXQ`#_vIsgSB(xaR!zTDLAL-5j(}70$SY)+TGdHY4 z{fwIzmH{kw3Ffvt`kS_*<~C&px8>dWevnBP^?S{WbQ%!)0tq4whFdBDE`lRXfE*j= zH7kQmZ0mzPId4&SIQW>fCeT6yNRxx!iyDQ1`w%%!+T3tQCUTG+YW7``AWnMCmR^NP z-&O$VDSJgqE+W_;xk}iyL|aVEDo_@LWpDQHsN9L7J_lW3Cl$b5INuO~qVC{2jj$;D zfiit_Us?(@`v@@oVsO-*S~|`R&3RoUiov3{Cn~c*t4k23USOP|Bi4OTV6s89h>((k zd{sayV+(5T&`X|3EYqZGlgDH0W7c%bns4AK!KYo< z37mhywg(^&}aa00Yhw{Jp*H@9|0dd>8hP_K_lHa>={}v3xiz)~`-s;a2;B!^e z+RtIQM+D4;0hcT`Yvi#-Nb&@K#O-$d|$3@TS-bgoD{+SeRcvfXzY*5jS!gdiZ=NAw&XymM+fEfX2(9-ho;9u^=H BODY > HTML > #document to 1 of DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 757x36 + text run at (0,0) width 757: "This tests for a bug where attachments dragged into Mail documents blew all content after the position being pasted into." + text run at (0,18) width 319: "You should see \"Hello[black box] World!\" below." + RenderBlock {DIV} at (0,52) size 784x156 + RenderText {#text} at (0,138) size 35x18 + text run at (0,138) width 35: "Hello" + RenderPartObject {OBJECT} at (35,0) size 302x152 [border: (1px solid #AAAAAA)] + RenderText {#text} at (337,138) size 49x18 + text run at (337,138) width 49: " World!" +caret: position 1 of child 1 {OBJECT} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document diff --git a/LayoutTests/editing/pasteboard/pasting-object.html b/LayoutTests/editing/pasteboard/pasting-object.html new file mode 100644 index 00000000000..41ebda839fb --- /dev/null +++ b/LayoutTests/editing/pasteboard/pasting-object.html @@ -0,0 +1,11 @@ + +

This tests for a bug where attachments dragged into Mail documents blew all content after the position being pasted into. You should see "Hello[black box] World!" below.

+
Hello World!
+ + + \ No newline at end of file diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index abcd7f28dde..6bb8e9d27aa 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2006-06-30 Justin Garcia + + Reviewed by levi + + * editing/htmlediting.cpp: + (WebCore::canHaveChildrenForEditing): Don't insert children into + object tags while editing. + 2006-06-30 Justin Garcia Reviewed by harrison diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp index 6f517a04319..6dc1b4d1a6a 100644 --- a/WebCore/editing/htmlediting.cpp +++ b/WebCore/editing/htmlediting.cpp @@ -83,6 +83,7 @@ bool canHaveChildrenForEditing(const Node* node) !node->hasTagName(brTag) && !node->hasTagName(imgTag) && !node->hasTagName(buttonTag) && + !node->hasTagName(objectTag) && !node->isTextNode(); } -- GitLab