From 3a83a136396034d8faf1bb96b33559f62fd5c35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Fri, 8 Sep 2017 17:27:05 +0200 Subject: [PATCH] Bug fix #53 --- demos/CustomResourceBrowser/uMainForm.pas | 1 + demos/DOMVisitor/uDOMVisitor.pas | 6 +- demos/JSEval/uJSEval.pas | 6 +- demos/JSExtension/uJSExtension.pas | 6 +- demos/MDIBrowser/MDIAPP.ICO | Bin 9062 -> 0 bytes demos/MDIBrowser/MDIAPP.bdsproj | 168 ----------------- demos/MDIBrowser/MDIAPP.res | Bin 448 -> 0 bytes demos/MDIBrowser/MDIAPP.stat | 10 - demos/MDIBrowser/MDIBrowser.dproj | 5 +- demos/MDIBrowser/MDIBrowser.dproj.local | 10 +- demos/MDIBrowser/MDIBrowser.dsk | 130 ++++++------- demos/MDIBrowser/MDIBrowser.stat | 12 +- demos/MDIBrowser/uChildForm.pas | 4 +- demos/MiniBrowser/MiniBrowser.dsk | 176 ++++++++---------- demos/MiniBrowser/MiniBrowser.stat | 8 +- .../PostDataInspector/uPostDataInspector.pas | 6 +- .../ToolBoxBrowser/ToolBoxBrowser.dproj.local | 10 +- demos/ToolBoxBrowser/ToolBoxBrowser.dsk | 44 ++--- demos/ToolBoxBrowser/ToolBoxBrowser.stat | 6 +- demos/ToolBoxBrowser/uChildForm.pas | 4 +- 20 files changed, 211 insertions(+), 401 deletions(-) delete mode 100644 demos/MDIBrowser/MDIAPP.ICO delete mode 100644 demos/MDIBrowser/MDIAPP.bdsproj delete mode 100644 demos/MDIBrowser/MDIAPP.res delete mode 100644 demos/MDIBrowser/MDIAPP.stat diff --git a/demos/CustomResourceBrowser/uMainForm.pas b/demos/CustomResourceBrowser/uMainForm.pas index 5f00f522..302d5dfc 100644 --- a/demos/CustomResourceBrowser/uMainForm.pas +++ b/demos/CustomResourceBrowser/uMainForm.pas @@ -111,6 +111,7 @@ var begin // This event is called from the IO thread. Use mutexes if necessary. TempStream := nil; + Result := nil; try try diff --git a/demos/DOMVisitor/uDOMVisitor.pas b/demos/DOMVisitor/uDOMVisitor.pas index a6b02bdd..2e1c2ed8 100644 --- a/demos/DOMVisitor/uDOMVisitor.pas +++ b/demos/DOMVisitor/uDOMVisitor.pas @@ -134,6 +134,8 @@ procedure TDOMVisitorFrm.Chromium1ProcessMessageReceived(Sender: TObject; const browser: ICefBrowser; sourceProcess: TCefProcessId; const message: ICefProcessMessage; out Result: Boolean); begin + Result := False; + if (message = nil) or (message.ArgumentList = nil) then exit; if (message.Name = DOMVISITOR_MSGNAME) then @@ -141,9 +143,7 @@ begin // Message received from the DOMVISITOR in CEF ShowStatusText('DOM Visitor result text : ' + message.ArgumentList.GetString(0)); Result := True; - end - else - Result := False; + end; end; procedure TDOMVisitorFrm.FormShow(Sender: TObject); diff --git a/demos/JSEval/uJSEval.pas b/demos/JSEval/uJSEval.pas index ddc40f4a..f4e00827 100644 --- a/demos/JSEval/uJSEval.pas +++ b/demos/JSEval/uJSEval.pas @@ -413,6 +413,8 @@ procedure TJSEvalFrm.Chromium1ProcessMessageReceived(Sender : TObject; const message : ICefProcessMessage; out Result : Boolean); begin + Result := False; + if (message = nil) or (message.ArgumentList = nil) then exit; if (message.Name = EVAL_JS) then @@ -427,9 +429,7 @@ begin FText := message.ArgumentList.GetString(0); PostMessage(Handle, MINIBROWSER_SHOWTEXTVIEWER, 0, 0); Result := True; - end - else - Result := False; + end; end; end. diff --git a/demos/JSExtension/uJSExtension.pas b/demos/JSExtension/uJSExtension.pas index c1c7ab15..12b17a42 100644 --- a/demos/JSExtension/uJSExtension.pas +++ b/demos/JSExtension/uJSExtension.pas @@ -176,6 +176,8 @@ procedure TJSExtensionFrm.Chromium1ProcessMessageReceived(Sender: TObject; const browser: ICefBrowser; sourceProcess: TCefProcessId; const message: ICefProcessMessage; out Result: Boolean); begin + Result := False; + if (message = nil) or (message.ArgumentList = nil) then exit; // This function receives the messages with the JavaScript results @@ -198,9 +200,7 @@ begin FText := message.ArgumentList.GetString(0); PostMessage(Handle, MINIBROWSER_SHOWTEXTVIEWER, 0, 0); Result := True; - end - else - Result := False; + end; end; procedure TJSExtensionFrm.FormShow(Sender: TObject); diff --git a/demos/MDIBrowser/MDIAPP.ICO b/demos/MDIBrowser/MDIAPP.ICO deleted file mode 100644 index 855c2e0383b0c61bfd59a7862e334e362158b8d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9062 zcmdUzv1=Sj7Kfj}%d{{)_Aj_rc+6f0ZE;-K8(pqod}xoOGqd4>L&LSufE@V`aMT+t z@=`W8n>sKh40d2-aKc{ z$eLV{jSbkcVpsbJ)gBB|jTJ5tKx zVdRh^32?xUl(Hy{98x6Gvvb`cr6ehY98x3&Twq5^SxOi=q(~~b!j6=()G%^Lk$Bi+ zM@m@&j2u!V3M+P`lxdJCDsf1Wq;OiTJEWAQfRRIrq=ZZCNGVGNBZm}84cFL_QWg&* zhZISG19qg8sYE>3ks=`yqGfy>G0xqy4r7R_k98x3|TwzB_S!x(Lq)0sM zu_L7{0Y(lf5``5zQpzGD;u#Uii18T_51ft|pAq8&7cg>2k(6+W9Vun0VC0Y@so@$s zQp)0CaKMg~vM7ukQY#Y$k*-Us>%EjRQY3{E2aL49UScm{q)004$RVw;*VtX9v&iPY&OwNV!DS8X`d$>Im9&5zR*656p6=<98!-xU=J`- z)Kkhxq)Q*W%zu~p?=s#na!8RBaM4|V|8HIY>Bk>=rFW=9MXPJ^MY8zt5pS^qoOyI| zJF@oM3fUMtv0i?}vA?@_w10H8>yGTYx4XLs)do*|QjArd) zt!IDSP4==_KeHbXC6nZVOOn?~lDOA<$%9Nz+E4yDl!Tu(4geV@d2(WZjmtqULm9|x zx;)^-K5Xn(aq#y%!=W=BB}d7A;<7>GKc_a{w*}wB<{Tss@??J;e~d5V7n6r0o)iCc zH9nk*BbAvo2QM9(f8|DO|%fT*Ec&VGn!Q!vPL(fCH?s!U`+QD$Ln)!Yx~!Qz(T~ zIE4$ifD5>QOSptfxP&XXf-AU!Yq*AMxQ0FKVGnyazyS_$fE89)`6$c=L!LrB74cNW z1E+8br*HumZ~+%^372pQmv9AFa0ORz4cBlD*RY2@>|qZFIKTl8u)+!}tnfHbAs$CO zd{Ra#b;JXwZ~+%^0T*xymv9M}a0ORz1=D1crw|WZ!ydcG?qLrHIKTl8u)+!}tnfHb zA)XO1A|7&ubVNLG3Kwtz7jOZWa0!=i30H6hS8xT_a1GaR4SU$b9` zI%4*eSO_vz;-H)oWU9mg7jOX=a0!=i372pMS8xSaa1GaR4cD-TJ?vo*2ROh14$6~4 zSt%bLl9njPCc264p+nk_c?#__X%*>04c9#6HC)3U_OORN9N+*4IM6BFF~B5-UCUGG zV;Af)-f#-1a0(Z2(e06^yeCijDZa^;o$zV$6oMxtzPJ-hM(x2K#G+@(07-#MG$S=| zNs~l$5@kzb58!U{fLsAPNG4-VvEN0zTyx`1+n6mfW1D4_WfzKewq)+bm6i5vgU@Yu z?)Nj22ikA8c5t$o}4b8WVJ z+}mj@Ie)ONF&b;$sh7uVgpcUj$Rg}YptpIQAizYiZiymXnL zdH&7t_U+qCllAXB{%y>*wzkeKt8e`}uYdDx$IF*5&n2sW5&qx3d#9_)V*Y>iKRNGD zpFY(`j~=b07cXAK`8sd^+j+lz`*s}nH*enPDzbQg%lNnc+iQFXm-zbl@nekF#_YoU zZ?bPMkj44<@#FZsO zf_L54g3I!MQSbX?->tlC|EKF+6fg3B*|~4qJ`e3@`F@iZURv(C?D)4a+STeT;#KBm z(fEJ%GGFkGh5na#=NIJwi|oxj&z^sK=h5(iFIdD9%A-szb()6 zZ)?uvvvyf!^E2!H`-1oM;D6@-!5cIFLovSfTgPYKo?_4FBAIX7>uhhI*1UG@_hz%U z+xk|R{`+xWyKNpZul}T8Yj^rsRKN9W*ICEB`qO@6{W{LF4g zyq@9L#<}eSKacZwQjfwSzh~B8;J2OQS^k&tdscnx!zxEJUgQ3sV}ChSe@?$A*JJy= s&H3b&c;&2q+i&N|>REjg{|`m{$2tCA^exv`cPVc*ddl_Dl&<{nUme(^UjP6A diff --git a/demos/MDIBrowser/MDIAPP.bdsproj b/demos/MDIBrowser/MDIAPP.bdsproj deleted file mode 100644 index 4c42d270..00000000 --- a/demos/MDIBrowser/MDIAPP.bdsproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - MDIAPP.dpr - - - 7.0 - - - 8 - 0 - 1 - 1 - 0 - 0 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 1 - 1 - 1 - True - True - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; - - False - - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - False - False - False - True - True - True - - - 0 - 0 - 1 - False - False - False - 16384 - 1048576 - 4194304 - - - - - - - - $(BDS)\units;$(BDS)\vcl;$(BDS)\rtl;$(BDS)\db;$(BDS)\app\ui\res;$(BDS)\app\ed\res;$(BDS)\app\design;$(BDS)\qt;$(BDS)\clx - - - - False - - - - - - False - - - - - - False - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - diff --git a/demos/MDIBrowser/MDIAPP.res b/demos/MDIBrowser/MDIAPP.res deleted file mode 100644 index a64cea33b7bbf9c30d10d7750693ab849f870abc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmZ9IO-chn5QV>ySr}Iy!G&uXVK#zb0{#&2k7USJhD0SG8Ax>JVZ4a9aqkTrzwWV# zNkPq2cfI%ObpafhZQG^gM)b4P-xuS-DCp%0)Xz%G31c4oUNEv6a>uRbq2EjE5TE(? z4+MUvk^X0~3qde-{;v3lcVk{zGH1cFYI9zARC&P@js5qCDJXSyVwQRcjtX|wOZbVL zB`evD%n-*MiAjl^fWH^jFyoD>Q@2^$oO5+DQMIfzY3&RS - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + IP Abstraction Indy Implementation Design Time + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/demos/MDIBrowser/MDIBrowser.dproj.local b/demos/MDIBrowser/MDIBrowser.dproj.local index 14b2383a..785999d0 100644 --- a/demos/MDIBrowser/MDIBrowser.dproj.local +++ b/demos/MDIBrowser/MDIBrowser.dproj.local @@ -2,10 +2,10 @@ 2017/05/01 10:03:03.000.353,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\about.pas= - 2017/05/01 11:22:18.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIAPP.dproj - 2017/05/01 12:25:35.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\Main.pas - 2017/05/01 12:25:35.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\Main.dfm - 2017/05/01 12:26:13.000.106,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\ChildWin.dfm - 2017/05/01 12:26:13.000.106,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\ChildWin.pas + 2017/05/01 11:22:18.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIAPP.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj + 2017/05/01 12:25:35.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\Main.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.pas + 2017/05/01 12:25:35.000.397,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\Main.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.dfm + 2017/05/01 12:26:13.000.106,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\ChildWin.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas + 2017/05/01 12:26:13.000.106,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\ChildWin.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.dfm diff --git a/demos/MDIBrowser/MDIBrowser.dsk b/demos/MDIBrowser/MDIBrowser.dsk index c004f903..f84400b9 100644 --- a/demos/MDIBrowser/MDIBrowser.dsk +++ b/demos/MDIBrowser/MDIBrowser.dsk @@ -1,36 +1,38 @@ [Closed Files] -File_0=TSourceModule,'c:\program files\embarcadero\studio\17.0\SOURCE\VCL\Vcl.Forms.pas',0,1,6306,1,6308,0,0,{{1729,4} -File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,53,20,81,0,0,, -File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas',0,1,1,22,38,0,0,, -File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas',0,1,1091,3,1120,0,0,, -File_4=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFMiscFunctions.pas',0,1,626,1,663,0,0,, -File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\uSimpleBrowser.pas',0,1,1,1,1,0,0,, -File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,289,21,334,0,0,, -File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFClient.pas',0,1,24,90,42,0,0,,{1 +File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFLifeSpanHandler.pas',0,1,218,90,218,0,0,, +File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas',0,1,2259,73,2287,0,0,, +File_2=TSourceModule,'c:\program files (x86)\embarcadero\studio\19.0\SOURCE\VCL\Vcl.Forms.pas',0,1,3703,39,3731,0,0,{{1747,4} +File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\FastMM4\FastMM4.pas',0,1,10238,1,10260,0,0,, +File_4=TSourceModule,'c:\program files\embarcadero\studio\17.0\SOURCE\VCL\Vcl.Forms.pas',0,1,6306,1,6308,0,0,{{1729,4} +File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,53,20,81,0,0,, +File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas',0,1,1,22,38,0,0,, +File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFMiscFunctions.pas',0,1,626,1,663,0,0,, +File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\uSimpleBrowser.pas',0,1,1,1,1,0,0,, +File_9=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,289,21,334,0,0,, [Modules] -Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas -Module1=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.pas -Module2=default.htm -Module3=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj +Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj +Module1=default.htm +Module2=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas +Module3=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.pas Count=4 EditWindowCount=1 +[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj] +ModuleType=TBaseProject + +[default.htm] +ModuleType=TURLModule + [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas] ModuleType=TSourceModule [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uMainForm.pas] ModuleType=TSourceModule -[default.htm] -ModuleType=TURLModule - -[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dproj] -ModuleType=TBaseProject - [EditWindow0] ViewCount=4 -CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas +CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dpr View0=0 View1=1 View2=2 @@ -51,18 +53,18 @@ ClientHeight=9417 DockedToMainForm=1 BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0 TopPanelSize=0 -LeftPanelSize=0 +LeftPanelSize=1898 +LeftPanelClients=PropertyInspector,DockSite3 +LeftPanelData=00000800010100000000A219000000000000016A0700000000000001000000005D0E000009000000446F636B53697465330100000000972300001100000050726F7065727479496E73706563746F72FFFFFFFF RightPanelSize=2000 -RightPanelClients=DockSite2 -RightPanelData=00000800010100000000A21900000000000001D00700000000000001000000009723000009000000446F636B5369746532FFFFFFFF +RightPanelClients=DockSite2,DockSite4 +RightPanelData=00000800010100000000A21900000000000001D00700000000000001000000004312000009000000446F636B536974653201000000009723000009000000446F636B5369746534FFFFFFFF BottomPanelSize=0 BottomPanelClients=DockSite1,MessageView BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361676556696577466F726D1234000000000000022506000000000000FFFFFFFF BottomMiddlePanelSize=0 BottomMiddlePanelClients=DockSite0,GraphDrawingModel BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF -TabDockLeftClients=PropertyInspector=0,DockSite3=1 -TabDockRightClients=DockSite4=0 [View0] CustomEditViewType=TWelcomePageView @@ -71,8 +73,8 @@ WelcomePageURL=bds:/default.htm [View1] CustomEditViewType=TEditView Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\MDIBrowser.dpr -CursorX=10 -CursorY=46 +CursorX=1 +CursorY=43 TopLine=37 LeftCol=1 Elisions= @@ -82,9 +84,9 @@ EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\d [View2] CustomEditViewType=TEditView Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MDIBrowser\uChildForm.pas -CursorX=15 -CursorY=80 -TopLine=65 +CursorX=87 +CursorY=96 +TopLine=87 LeftCol=1 Elisions= Bookmarks= @@ -166,11 +168,11 @@ State=0 Left=0 Top=0 Width=2000 -Height=8935 +Height=4305 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=8935 +ClientHeight=4305 TBDockHeight=5897 LRDockWidth=2352 Dockable=1 @@ -203,12 +205,12 @@ Docked=1 State=0 Left=0 Top=0 -Width=1875 -Height=6794 +Width=2000 +Height=4383 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6794 +ClientWidth=2000 +ClientHeight=4383 TBDockHeight=7152 LRDockWidth=2000 Dockable=1 @@ -258,8 +260,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=-30 +Left=-121 +Top=-70 Width=1844 Height=3139 MaxLeft=-1 @@ -312,18 +314,18 @@ StayOnTop=0 [PropertyInspector] PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 -Left=78 -Top=386 +Left=0 +Top=357 Width=1898 -Height=7220 +Height=5415 MaxLeft=-1 MaxTop=-1 ClientWidth=1898 -ClientHeight=7220 -TBDockHeight=7220 +ClientHeight=5415 +TBDockHeight=7164 LRDockWidth=1898 Dockable=1 StayOnTop=0 @@ -373,8 +375,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=287 +Left=-1152 +Top=247 Width=273 Height=359 MaxLeft=-1 @@ -626,11 +628,11 @@ State=0 Left=0 Top=0 Width=1898 -Height=9137 +Height=3554 MaxLeft=-1 MaxTop=-1 ClientWidth=1898 -ClientHeight=9137 +ClientHeight=3554 TBDockHeight=3677 LRDockWidth=1898 Dockable=1 @@ -736,12 +738,12 @@ State=0 Left=0 Top=18 Width=2000 -Height=9215 +Height=4585 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=9215 -TBDockHeight=7220 +ClientHeight=4585 +TBDockHeight=7164 LRDockWidth=2000 Dockable=1 StayOnTop=0 @@ -750,22 +752,22 @@ ActiveTabID=ProjectManager TabDockClients=ProjectManager,ModelViewTool,DataExplorerContainer,frmDesignPreview,TFileExplorerForm [DockSite3] -HostDockSite=LeftDockTabSet +HostDockSite=DockLeftPanel DockSiteType=1 PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 -Left=1 -Top=24 +Left=0 +Top=18 Width=1898 -Height=9137 +Height=3554 MaxLeft=-1 MaxTop=-1 ClientWidth=1898 -ClientHeight=9137 -TBDockHeight=7220 +ClientHeight=3554 +TBDockHeight=7164 LRDockWidth=1898 Dockable=1 StayOnTop=0 @@ -774,22 +776,22 @@ ActiveTabID=StructureView TabDockClients=StructureView,ClassBrowserTool [DockSite4] -HostDockSite=RightTabDock +HostDockSite=DockRightPanel DockSiteType=1 PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 Left=0 -Top=0 +Top=449 Width=2000 -Height=7220 +Height=4383 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6794 -TBDockHeight=7220 +ClientWidth=2000 +ClientHeight=4383 +TBDockHeight=7164 LRDockWidth=2000 Dockable=1 StayOnTop=0 diff --git a/demos/MDIBrowser/MDIBrowser.stat b/demos/MDIBrowser/MDIBrowser.stat index 089b4080..66f87297 100644 --- a/demos/MDIBrowser/MDIBrowser.stat +++ b/demos/MDIBrowser/MDIBrowser.stat @@ -1,10 +1,10 @@ [Stats] -EditorSecs=5424 -DesignerSecs=25 -InspectorSecs=4 -CompileSecs=157087 -OtherSecs=361 +EditorSecs=6316 +DesignerSecs=26 +InspectorSecs=5 +CompileSecs=199870 +OtherSecs=496 StartTime=01/05/2017 12:55:55 RealKeys=0 EffectiveKeys=0 -DebugSecs=530 +DebugSecs=1340 diff --git a/demos/MDIBrowser/uChildForm.pas b/demos/MDIBrowser/uChildForm.pas index 2b3c2df9..d576b8ea 100644 --- a/demos/MDIBrowser/uChildForm.pas +++ b/demos/MDIBrowser/uChildForm.pas @@ -93,7 +93,7 @@ implementation // Destruction steps // ================= // 1. FormCloseQuery calls TChromium.CloseBrowser -// 2. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 and Chromium1 in the main thread. +// 2. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 in the main thread. // 3. TChromium.OnBeforeClose sets FCanClose := True and sends WM_CLOSE to the form. @@ -116,6 +116,7 @@ end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; out Result: Boolean); begin PostMessage(Handle, CEFBROWSER_DESTROY, 0, 0); + Result := False; end; procedure TChildForm.FormClose(Sender: TObject; var Action: TCloseAction); @@ -177,7 +178,6 @@ end; procedure TChildForm.BrowserDestroyMsg(var aMessage : TMessage); begin CEFWindowParent1.Free; - Chromium1.Free; end; end. diff --git a/demos/MiniBrowser/MiniBrowser.dsk b/demos/MiniBrowser/MiniBrowser.dsk index 1b54db12..246aafb9 100644 --- a/demos/MiniBrowser/MiniBrowser.dsk +++ b/demos/MiniBrowser/MiniBrowser.dsk @@ -1,25 +1,21 @@ [Closed Files] -File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,194,16,223,0,0,, -File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas',0,1,1065,56,1098,0,0,, -File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,1712,23,1740,0,0,, -File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFPDFPrintCallback.pas',0,1,79,1,88,0,0,, -File_4=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromiumWindow.pas',0,1,70,37,58,0,0,, -File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFWindowParent.pas',0,1,65,27,66,0,0,, -File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFInterfaces.pas',0,1,246,22,279,0,0,, -File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFPostData.pas',0,1,97,1,134,0,0,, -File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFRequest.pas',0,1,104,1,126,0,0,, -File_9=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFRequestHandler.pas',0,1,115,1,118,0,0,, +File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas',0,1,578,45,611,0,0,, +File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\FastMM4\FastMM4.pas',0,1,9585,88,9618,0,0,, +File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFApplication.pas',0,1,194,16,223,0,0,, +File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas',0,1,1065,56,1098,0,0,, +File_4=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,1712,23,1740,0,0,, +File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFPDFPrintCallback.pas',0,1,79,1,88,0,0,, +File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromiumWindow.pas',0,1,70,37,58,0,0,, +File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFWindowParent.pas',0,1,65,27,66,0,0,, +File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFInterfaces.pas',0,1,246,22,279,0,0,, +File_9=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFPostData.pas',0,1,97,1,134,0,0,, [Modules] -Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas -Module1=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj -Module2=default.htm -Count=3 +Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj +Module1=default.htm +Count=2 EditWindowCount=1 -[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas] -ModuleType=TSourceModule - [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj] ModuleType=TBaseProject @@ -27,11 +23,10 @@ ModuleType=TBaseProject ModuleType=TURLModule [EditWindow0] -ViewCount=3 -CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas +ViewCount=2 +CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dpr View0=0 View1=1 -View2=2 PercentageSizes=1 Create=1 Visible=1 @@ -48,18 +43,18 @@ ClientHeight=9417 DockedToMainForm=1 BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0 TopPanelSize=0 -LeftPanelSize=0 +LeftPanelSize=1898 +LeftPanelClients=PropertyInspector,DockSite3 +LeftPanelData=00000800010100000000A219000000000000016A0700000000000001000000005D0E000009000000446F636B53697465330100000000972300001100000050726F7065727479496E73706563746F72FFFFFFFF RightPanelSize=2000 -RightPanelClients=DockSite2 -RightPanelData=00000800010000000000972300000000000000D90A00000000000001000000009723000009000000446F636B5369746532FFFFFFFF -BottomPanelSize=1551 +RightPanelClients=DockSite2,DockSite4 +RightPanelData=00000800010100000000A21900000000000001D00700000000000001000000004312000009000000446F636B536974653201000000009723000009000000446F636B5369746534FFFFFFFF +BottomPanelSize=0 BottomPanelClients=DockSite1,MessageView -BottomPanelData=0000080001020100000009000000446F636B53697465313B36000000000000020F0600000000000001000000003B3600000F0000004D65737361676556696577466F726DFFFFFFFF +BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361676556696577466F726D1234000000000000022506000000000000FFFFFFFF BottomMiddlePanelSize=0 BottomMiddlePanelClients=DockSite0,GraphDrawingModel BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF -TabDockLeftClients=PropertyInspector=0,DockSite3=1 -TabDockRightClients=DockSite4=0 [View0] CustomEditViewType=TWelcomePageView @@ -68,25 +63,14 @@ WelcomePageURL=bds:/default.htm [View1] CustomEditViewType=TEditView Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dpr -CursorX=2 -CursorY=73 -TopLine=43 +CursorX=1 +CursorY=1 +TopLine=1 LeftCol=1 Elisions= Bookmarks= EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dpr -[View2] -CustomEditViewType=TEditView -Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas -CursorX=89 -CursorY=231 -TopLine=578 -LeftCol=1 -Elisions= -Bookmarks= -EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas - [UndockedDesigner] Count=0 @@ -104,11 +88,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=213 LRDockWidth=13602 Dockable=1 @@ -152,11 +136,11 @@ State=0 Left=0 Top=0 Width=2000 -Height=7265 +Height=4305 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=7265 +ClientHeight=4305 TBDockHeight=5897 LRDockWidth=2352 Dockable=1 @@ -165,18 +149,18 @@ StayOnTop=0 [MessageView] PercentageSizes=1 Create=1 -Visible=1 +Visible=0 Docked=1 State=0 Left=0 -Top=18 -Width=10000 -Height=1401 +Top=0 +Width=2773 +Height=1424 MaxLeft=-1 MaxTop=-1 -ClientWidth=10000 -ClientHeight=1401 -TBDockHeight=1401 +ClientWidth=2773 +ClientHeight=1424 +TBDockHeight=1424 LRDockWidth=2773 Dockable=1 StayOnTop=0 @@ -189,12 +173,12 @@ Docked=1 State=0 Left=0 Top=0 -Width=1875 -Height=6738 +Width=2000 +Height=4383 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6738 +ClientWidth=2000 +ClientHeight=4383 TBDockHeight=7152 LRDockWidth=2000 Dockable=1 @@ -244,8 +228,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=-30 +Left=-121 +Top=-70 Width=1844 Height=3139 MaxLeft=-1 @@ -298,17 +282,17 @@ StayOnTop=0 [PropertyInspector] PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 -Left=78 -Top=386 +Left=0 +Top=357 Width=1898 -Height=7164 +Height=5415 MaxLeft=-1 MaxTop=-1 ClientWidth=1898 -ClientHeight=7164 +ClientHeight=5415 TBDockHeight=7164 LRDockWidth=1898 Dockable=1 @@ -359,8 +343,8 @@ Create=1 Visible=0 Docked=1 State=0 -Left=-8 -Top=287 +Left=-1152 +Top=247 Width=273 Height=359 MaxLeft=-1 @@ -384,11 +368,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=415 LRDockWidth=4953 Dockable=1 @@ -403,11 +387,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=213 LRDockWidth=7406 Dockable=1 @@ -426,11 +410,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=1536 LRDockWidth=3484 Dockable=1 @@ -445,11 +429,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=2063 LRDockWidth=3484 Dockable=1 @@ -586,11 +570,11 @@ State=0 Left=0 Top=0 Width=3820 -Height=1121 +Height=1143 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1121 +ClientHeight=1143 TBDockHeight=1547 LRDockWidth=8742 Dockable=1 @@ -611,12 +595,12 @@ Docked=1 State=0 Left=0 Top=0 -Width=1773 -Height=6738 +Width=1898 +Height=3554 MaxLeft=-1 MaxTop=-1 -ClientWidth=1773 -ClientHeight=6738 +ClientWidth=1898 +ClientHeight=3554 TBDockHeight=3677 LRDockWidth=1898 Dockable=1 @@ -698,12 +682,12 @@ State=0 Left=0 Top=18 Width=3820 -Height=1401 +Height=1424 MaxLeft=-1 MaxTop=-1 ClientWidth=3820 -ClientHeight=1401 -TBDockHeight=1401 +ClientHeight=1424 +TBDockHeight=1424 LRDockWidth=3820 Dockable=1 StayOnTop=0 @@ -722,11 +706,11 @@ State=0 Left=0 Top=18 Width=2000 -Height=7545 +Height=4585 MaxLeft=-1 MaxTop=-1 ClientWidth=2000 -ClientHeight=7545 +ClientHeight=4585 TBDockHeight=7164 LRDockWidth=2000 Dockable=1 @@ -736,21 +720,21 @@ ActiveTabID=ProjectManager TabDockClients=ProjectManager,ModelViewTool,DataExplorerContainer,frmDesignPreview,TFileExplorerForm [DockSite3] -HostDockSite=LeftDockTabSet +HostDockSite=DockLeftPanel DockSiteType=1 PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 Left=0 -Top=0 +Top=18 Width=1898 -Height=7164 +Height=3554 MaxLeft=-1 MaxTop=-1 -ClientWidth=1773 -ClientHeight=6738 +ClientWidth=1898 +ClientHeight=3554 TBDockHeight=7164 LRDockWidth=1898 Dockable=1 @@ -760,21 +744,21 @@ ActiveTabID=StructureView TabDockClients=StructureView,ClassBrowserTool [DockSite4] -HostDockSite=RightTabDock +HostDockSite=DockRightPanel DockSiteType=1 PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=1 State=0 Left=0 -Top=0 +Top=449 Width=2000 -Height=7164 +Height=4383 MaxLeft=-1 MaxTop=-1 -ClientWidth=1875 -ClientHeight=6738 +ClientWidth=2000 +ClientHeight=4383 TBDockHeight=7164 LRDockWidth=2000 Dockable=1 diff --git a/demos/MiniBrowser/MiniBrowser.stat b/demos/MiniBrowser/MiniBrowser.stat index 6cabc53d..704b1796 100644 --- a/demos/MiniBrowser/MiniBrowser.stat +++ b/demos/MiniBrowser/MiniBrowser.stat @@ -1,10 +1,10 @@ [Stats] -EditorSecs=47251 +EditorSecs=47373 DesignerSecs=2448 InspectorSecs=1794 -CompileSecs=2563039 -OtherSecs=7418 +CompileSecs=2570804 +OtherSecs=7442 StartTime=11/02/2017 10:51:15 RealKeys=0 EffectiveKeys=0 -DebugSecs=38530 +DebugSecs=38622 diff --git a/demos/PostDataInspector/uPostDataInspector.pas b/demos/PostDataInspector/uPostDataInspector.pas index 2f57aeae..63cffd7a 100644 --- a/demos/PostDataInspector/uPostDataInspector.pas +++ b/demos/PostDataInspector/uPostDataInspector.pas @@ -104,6 +104,8 @@ procedure TPostDataInspectorFrm.Chromium1ProcessMessageReceived( sourceProcess: TCefProcessId; const message: ICefProcessMessage; out Result: Boolean); begin + Result := False; + if (message = nil) or (message.ArgumentList = nil) then exit; // Many of these events are received in different threads and the VCL @@ -117,9 +119,7 @@ begin begin StatusBar1.Panels[0].Text := message.ArgumentList.GetString(0); // this doesn't create/destroy components Result := True; - end - else - Result := False; + end; end; procedure TPostDataInspectorFrm.FormShow(Sender: TObject); diff --git a/demos/ToolBoxBrowser/ToolBoxBrowser.dproj.local b/demos/ToolBoxBrowser/ToolBoxBrowser.dproj.local index 8d868d00..7dde1148 100644 --- a/demos/ToolBoxBrowser/ToolBoxBrowser.dproj.local +++ b/demos/ToolBoxBrowser/ToolBoxBrowser.dproj.local @@ -2,11 +2,11 @@ 2017/05/21 15:39:53.000.029,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas - 2017/05/21 15:40:36.000.672,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uMainForm.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas - 2017/05/21 15:40:36.000.672,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uMainForm.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm - 2017/05/21 15:40:43.000.627,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj + 2017/05/21 15:40:36.000.672,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uMainForm.pas + 2017/05/21 15:40:36.000.672,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uMainForm.dfm + 2017/05/21 15:40:43.000.627,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj 2017/05/21 15:44:20.000.154,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\Unit2.pas - 2017/05/21 15:46:19.000.247,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\Unit2.pas - 2017/05/21 15:46:19.000.247,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\Unit2.dfm + 2017/05/21 15:46:19.000.247,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\Unit2.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.dfm + 2017/05/21 15:46:19.000.247,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\Unit2.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas diff --git a/demos/ToolBoxBrowser/ToolBoxBrowser.dsk b/demos/ToolBoxBrowser/ToolBoxBrowser.dsk index fe17bc0d..b46438c4 100644 --- a/demos/ToolBoxBrowser/ToolBoxBrowser.dsk +++ b/demos/ToolBoxBrowser/ToolBoxBrowser.dsk @@ -10,24 +10,24 @@ File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFDisplayHandler.pas',0,1,85,35,133,0,0,, [Modules] -Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas -Module1=default.htm -Module2=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj +Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj +Module1=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas +Module2=default.htm Count=3 EditWindowCount=1 +[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj] +ModuleType=TBaseProject + [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas] ModuleType=TSourceModule [default.htm] ModuleType=TURLModule -[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dproj] -ModuleType=TBaseProject - [EditWindow0] ViewCount=3 -CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas +CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\ToolBoxBrowser.dpr View0=0 View1=1 View2=2 @@ -57,7 +57,7 @@ BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361 BottomMiddlePanelSize=0 BottomMiddlePanelClients=DockSite0,GraphDrawingModel BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF -TabDockLeftClients=DockSite3=0,PropertyInspector=1 +TabDockLeftClients=PropertyInspector=0,DockSite3=1 TabDockRightClients=DockSite4=0 [View0] @@ -78,9 +78,9 @@ EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\d [View2] CustomEditViewType=TEditView Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\ToolBoxBrowser\uChildForm.pas -CursorX=31 -CursorY=240 -TopLine=43 +CursorX=87 +CursorY=104 +TopLine=66 LeftCol=1 Elisions= Bookmarks= @@ -189,11 +189,11 @@ State=0 Left=0 Top=0 Width=1875 -Height=6794 +Height=6738 MaxLeft=-1 MaxTop=-1 ClientWidth=1875 -ClientHeight=6794 +ClientHeight=6738 TBDockHeight=7152 LRDockWidth=2000 Dockable=1 @@ -300,14 +300,14 @@ Create=1 Visible=0 Docked=1 State=0 -Left=0 -Top=18 +Left=78 +Top=386 Width=1898 -Height=9215 +Height=7220 MaxLeft=-1 MaxTop=-1 -ClientWidth=1898 -ClientHeight=9215 +ClientWidth=1773 +ClientHeight=6794 TBDockHeight=7220 LRDockWidth=1898 Dockable=1 @@ -726,7 +726,7 @@ MaxLeft=-1 MaxTop=-1 ClientWidth=2000 ClientHeight=9215 -TBDockHeight=7220 +TBDockHeight=7164 LRDockWidth=2000 Dockable=1 StayOnTop=0 @@ -769,12 +769,12 @@ State=0 Left=0 Top=0 Width=2000 -Height=7220 +Height=7164 MaxLeft=-1 MaxTop=-1 ClientWidth=1875 -ClientHeight=6794 -TBDockHeight=7220 +ClientHeight=6738 +TBDockHeight=7164 LRDockWidth=2000 Dockable=1 StayOnTop=0 diff --git a/demos/ToolBoxBrowser/ToolBoxBrowser.stat b/demos/ToolBoxBrowser/ToolBoxBrowser.stat index 9f12700e..238a88c3 100644 --- a/demos/ToolBoxBrowser/ToolBoxBrowser.stat +++ b/demos/ToolBoxBrowser/ToolBoxBrowser.stat @@ -1,9 +1,9 @@ [Stats] -EditorSecs=703 +EditorSecs=825 DesignerSecs=17 InspectorSecs=1 -CompileSecs=40631 -OtherSecs=85 +CompileSecs=47805 +OtherSecs=99 StartTime=21/05/2017 17:35:40 RealKeys=0 EffectiveKeys=0 diff --git a/demos/ToolBoxBrowser/uChildForm.pas b/demos/ToolBoxBrowser/uChildForm.pas index 7205345f..e9a4fff8 100644 --- a/demos/ToolBoxBrowser/uChildForm.pas +++ b/demos/ToolBoxBrowser/uChildForm.pas @@ -101,7 +101,7 @@ implementation // Destruction steps // ================= // 1. FormCloseQuery calls TChromium.CloseBrowser -// 2. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 and Chromium1 in the main thread. +// 2. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 in the main thread. // 3. TChromium.OnBeforeClose sets FCanClose := True and sends WM_CLOSE to the form. procedure TChildForm.Chromium1AfterCreated(Sender: TObject; const browser: ICefBrowser); @@ -118,6 +118,7 @@ end; procedure TChildForm.Chromium1Close(Sender: TObject; const browser: ICefBrowser; out Result: Boolean); begin PostMessage(Handle, CEFBROWSER_DESTROY, 0, 0); + Result := False; end; procedure TChildForm.Chromium1KeyEvent(Sender: TObject; @@ -244,7 +245,6 @@ end; procedure TChildForm.BrowserDestroyMsg(var aMessage : TMessage); begin CEFWindowParent1.Free; - Chromium1.Free; end; end.