DELTA 325283 0 667 SVNtTuSk.K ?ku40BE> mP_6- 29+Ix^}Um6EwIԻBM+6-'UcK؁C(@vv3̫~fp@08GF:9 DiY٩iHΕ Jn ZXaSN2:DD&Ib$[.R[T9f]L0+# Ȝ\9 Wz3ւ_Bi +؂il0'i> iѯ'}/pY5迂?s;`TΕ=oO~g yI޺k-4[+/fZ(ki+; k ۳̹U7%:-HT9&RY?}߳ѽ¥px\ d)6 1}Y\h~jBmb,>:lp;fmٱ0yˠ |b'd48Cܽ}I+xJcMF4rO?qF~<Ex?,Fyx@gLD +8DC,T&*-_Ow\]J%ػ(>p&Н}laMa1 L! ÿ1emk.wLe -B?n}o!4޳B=ye/t[ǩP=oy_jhTOe?MĂBfO$|mr[sKGӽ ߦnhRpmљHEȶ bO2+ lӼlIQZv,ᤅ)4l$IIaE &?M^1u-g>ru̷y#7w>~ЏfA .9+27gu~RY$fRĆft + ȮP} ~n#J?pz†"c'),jczuyUΧN؛_sZ._TE5j †Kd!oH,ݢ\kTu!oMwUsk--5w⁊rRRy+6{z n*}zZ! ,x`dНY&]ޙ(2cc ; e"QS#9qևt>@E % H_!q=&^R }sӻ= yd RSYPijS.170\21OS6]ڝ-Z^gئVnג1־_뒫{NȊ`pCq_x/(~,mYJ<>uBitjV( mlb a@$".2=6?NwsLeSݮ K6<[DZHDW!ʦI/; ZMl\ fSCT5%)1/eƧz*Ui1B`P*Uq׶6TWʾʀaUV7'O+3)$bfm7-"`qmj!}S8~0|@î*\#B K\]QɵP7X4RvR.76ĪΒ#Rg6'N,CbԍTFdJc1cە#QZ-,$Ǜ7Qm:*p\\.WP'4>Pj?s#gM9WB~xJU]誈d|^ܑENDREP DELTA SVNUx^u]k0_qtYakcgeu@jjXHeUDܖ9'ycYIA;MKT5/9SNS[H:g9q}{=90q40\<߻Ea=׼q} p (!%l  Y."zܭi9w`N Jt|jXvOӺ=B3)iG|_g:s1_px)?(qDqX3Z-4q0ap'$LD;Hx]4aKAUX%K! %d*Ãye ˡV?0($] cd-WY9 QSӺ|oij_ (ENDREP DELTA SVNN@NNx^_o0şǧH 1&lHwEi1nK}l3Yn{{~ض OBWa\|c⥨_,sJ7>vD  4 F/Z ;}  h ch- ޛDu ptj~D@^)a3x6L6ap]XԔVlE0D( ^7LA#W52.=oX| >[RƬ~hc2qoaU'q]#qu9\`nl$:,;^ڮwt9O&Դ}5lENDREP DELTA SVN4644--- chrome/browser/gpu/chrome_gpu_util.cc.orig 2013-09-02 20:57:36.000000000 +0300 +++ chrome/browser/gpu/chrome_gpu_util.cc 2013-09-02 20:59:37.000000000 +0300 @@ -36,7 +36,7 @@ bool ShouldRunCompositingFieldTrial() { // Enable the field trial only on desktop OS's. -#if !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#if !(defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))) return false; #endif ENDREP DELTA SVNprpp--- chrome/browser/gpu/gl_string_manager.cc.orig 2013-09-02 20:59:56.000000000 +0300 +++ chrome/browser/gpu/gl_string_manager.cc 2013-09-02 21:01:13.000000000 +0300 @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { // On MacOSX or Windows, preliminary GPUInfo is enough. -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // We never remove this observer from GpuDataManager. content::GpuDataManager::GetInstance()->AddObserver(this); ENDREP DELTA SVNRbRRx^Pj0}W1K}a tusejeNMc"is!s=$ʹahuQ}Qu4CEݦ48tZwUm3O59nU\pA.95]t |~ _TIt[0+Phmqq埜E=JD))DdpFs[C;@֌q4]\ǻgϖ_'_Gb_/ u'͜AіF~#=JHIOcik/[LUI?SVSAENDREP DELTA SVNxx^K@ǟ_1( iM Rk[n&@v7V?m΂z/˰_3iʡrAUAK{'J+e;XLLڞX1NeF0*˫AƌEI|j|z2bxIO&Nͦwb6P^nД.k%!+7nq|PaM j]>Η1~~LW3[/qE%=3g1_><}%g˟8J{Cl#Bwlx 玴P RMX0A0kB;)`ӆA MpP36JamoP aR[RC1`Gs%zENDREP DELTA SVNwawwx^[K1_1K˺KJ}(HWZo RfIIf-ՂB&9|(0QslQKh%J-SQJ2ͬU-ci%i;JQAn͂0i'I߸~ӝ} F,:T0@h CMLB36&`&H̀C jO5LɎ$V*ZA5@Se^qeॻ=@tҪV F HF'ӳ _d2hw_y3~<a\䃼<}\#*<ЂJfXKkHV2Q,1x%)ENDREP DELTA SVN3533--- gpu/config/gpu_control_list.cc.orig 2013-09-02 21:03:44.000000000 +0300 +++ gpu/config/gpu_control_list.cc 2013-09-02 21:05:31.000000000 +0300 @@ -1346,10 +1346,10 @@ return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) - return kOsLinux; #elif defined(OS_MACOSX) return kOsMacosx; +#elif defined(OS_POSIX) + return kOsLinux; #else return kOsUnknown; #endif ENDREP DELTA SVN { x^Q]K0}v -]tesPvfθ6M/ssBVJUWT-xh-RR4Ȓz#|pzÞ{1n9_z;1lUpMyt}\ Kyť tSwPds">&/PРENDREP DELTA SVNl4llx^QO0ǟZ up\+y[ ")݁1azݟײ*nL )︳Xt3.W:ؾNC`R0ͨ:=@K݃0D0+Pt>0ET#TxۂO-C&rDf0-d(4S+UyxOENDREP DELTA SVNXZXX--- net/base/mime_util_unittest.cc.orig 2013-09-02 22:31:36.000000000 +0300 +++ net/base/mime_util_unittest.cc 2013-09-02 22:32:33.000000000 +0300 @@ -245,7 +245,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) +#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) { "video/*", 6, "mpg" }, #else { "video/*", 6, "mpeg" }, ENDREP DELTA SVN*,**--- net/base/net_util.h.orig 2013-09-01 00:45:45.000000000 +0300 +++ net/base/net_util.h 2013-09-01 00:47:35.000000000 +0300 @@ -13,6 +13,9 @@ #elif defined(OS_POSIX) #include #include +#if defined(OS_BSD) +#include +#endif #endif #include ENDREP DELTA SVN--- net/dns/dns_config_service_posix_unittest.cc.orig 2013-09-01 00:10:54.000000000 +0300 +++ net/dns/dns_config_service_posix_unittest.cc 2013-09-01 00:22:00.000000000 +0300 @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - #include "base/sys_byteorder.h" #include "net/dns/dns_config_service_posix.h" ENDREP DELTA SVNV0VVx^]K0k+ݍM@en Rl ڒd៷݇E9R(P;K^ x%Tbk]JpYϣ2\w8`Cw`Sdc4?x;y-=f]y|@)e4K.UsH$_z[$sp. .(ލ{\$W2ٮ0O0A,B> K* N-=Xg< aE]"fS)p`,jTov Y-GD=fAEhT>ENDREP DELTA 290785 12824 497 SVN_K r @ x^}j 8BMvIg CR#%l$E ..= ?90ؐ]O?b (D⽀1ţ8 @,e񟧮 +T uW ap^'g%%4 }ٵfm95~1$n V BvQt^OC&63o*?Ay◣wE7zwENDREP DELTA SVNZ\ZZ--- net/socket/tcp_listen_socket_unittest.h.orig 2013-09-01 00:30:34.000000000 +0300 +++ net/socket/tcp_listen_socket_unittest.h 2013-09-01 00:31:11.000000000 +0300 @@ -13,6 +13,9 @@ #include #include #include +#if defined(OS_BSD) +#include +#endif #endif #include "base/basictypes.h" ENDREP DELTA SVN=?==--- net/udp/udp_socket_unittest.cc.orig 2013-09-01 17:50:31.000000000 +0300 +++ net/udp/udp_socket_unittest.cc 2013-09-01 17:50:50.000000000 +0300 @@ -202,7 +202,7 @@ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); } -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // UDPSocketPrivate_Broadcast is disabled for OSX because it requires // root permissions on OSX 10.7+. TEST_F(UDPSocketTest, DISABLED_Broadcast) { ENDREP DELTA 312796 4224 432 SVNa $ 6h6Cyx^Rmk01颩vke:Fj K|c`G ; B2΢$QE XE+f2O𬊵MW8e|4Pq cEUӟkV[oq=z.nWJ( Z1-e~ z%<1*z]F? wTOIaWQRX~.+p[F B%\!xۙ`24r~$ aggVRМ8{b8, %ȑ ) "X HoF*7%%= ed^ ڎNgZ䉺#I Ƀbq{eph;iaϊJ(PYy;\ieо']d[d