Bug fix : Render process crash with large images

2025-04-07 06:50:04 +02:00 · 2017-04-15 18:19:22 +02:00 · 2017-04-15 18:19:22 +02:00 · f912c6d5ec
commit f912c6d5ec
parent 78decde2b8
16 changed files with 284 additions and 305 deletions
--- a/demos/MiniBrowser/MiniBrowser.dpr
+++ b/demos/MiniBrowser/MiniBrowser.dpr
@ -42,10 +42,10 @@ program MiniBrowser;

 uses
  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
+  WinApi.Windows, Vcl.Forms,
  {$ELSE}
-  Forms,
-  {$ENDIF }
+  Windows, Forms,
+  {$ENDIF}
  uCEFApplication,
  uCEFMiscFunctions,
  uCEFSchemeRegistrar,
@ -63,6 +63,9 @@ uses

 {$R *.res}

+// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
+
 var
  TempProcessHandler : TCefCustomRenderProcessHandler;

--- a/demos/MiniBrowser/MiniBrowser.dproj.local
+++ b/demos/MiniBrowser/MiniBrowser.dproj.local
@ -2,16 +2,16 @@
 <BorlandProject>
 	<Transactions>
    <Transaction>2017/02/11 10:15:32.000.980,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
-    <Transaction>2017/02/11 10:16:27.000.174,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas</Transaction>
-    <Transaction>2017/02/11 10:16:27.000.174,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.dfm</Transaction>
-    <Transaction>2017/02/11 10:16:37.000.392,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj</Transaction>
+    <Transaction>2017/02/11 10:16:27.000.174,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
+    <Transaction>2017/02/11 10:16:27.000.174,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm</Transaction>
+    <Transaction>2017/02/11 10:16:37.000.392,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj</Transaction>
    <Transaction>2017/02/11 17:10:26.000.471,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas</Transaction>
-    <Transaction>2017/02/11 17:11:01.000.244,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas</Transaction>
+    <Transaction>2017/02/11 17:11:01.000.244,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas</Transaction>
    <Transaction>2017/03/12 17:11:11.000.786,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uFileScheme.pas</Transaction>
    <Transaction>2017/03/13 19:22:41.000.994,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uFileScheme.pas=</Transaction>
    <Transaction>2017/03/13 19:23:05.000.371,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uHelloScheme.pas</Transaction>
    <Transaction>2017/03/15 12:39:07.000.741,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas</Transaction>
-    <Transaction>2017/03/15 12:40:51.000.061,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uPreferences.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas</Transaction>
-    <Transaction>2017/03/15 12:40:51.000.061,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uPreferences.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.dfm</Transaction>
+    <Transaction>2017/03/15 12:40:51.000.061,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uPreferences.dfm</Transaction>
+    <Transaction>2017/03/15 12:40:51.000.061,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uPreferences.pas</Transaction>
  </Transactions>
 </BorlandProject>
--- a/demos/MiniBrowser/MiniBrowser.dsk
+++ b/demos/MiniBrowser/MiniBrowser.dsk
@ -1,20 +1,19 @@
 [Closed Files]
-File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Handler.pas',0,1,691,3,720,0,0,,
-File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFLibFunctions.pas',0,1,172,3,201,0,0,,
-File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Context.pas',0,1,73,57,88,0,0,,
-File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFMiscFunctions.pas',0,1,261,25,292,0,0,,
-File_4=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,2519,19,2538,0,0,,
-File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFBrowserProcessHandler.pas',0,1,43,80,53,0,0,,
-File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromiumFontOptions.pas',0,1,29,3,58,0,0,,
-File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromiumOptions.pas',0,1,47,3,58,0,0,,
+File_0=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFTypes.pas',0,1,340,24,367,0,0,,
+File_1=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas',0,1,41,1,72,0,0,,
+File_2=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas',0,1,344,85,370,0,0,,
+File_3=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Handler.pas',0,1,691,3,720,0,0,,
+File_4=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFLibFunctions.pas',0,1,172,3,201,0,0,,
+File_5=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFv8Context.pas',0,1,73,57,88,0,0,,
+File_6=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFMiscFunctions.pas',0,1,261,25,292,0,0,,
+File_7=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFBrowserProcessHandler.pas',0,1,43,80,53,0,0,,
+File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromiumFontOptions.pas',0,1,29,3,58,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=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas
-Module3=default.htm
-Module4=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas
-Count=5
+Module2=default.htm
+Count=3
 EditWindowCount=1

 [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas]
@ -25,27 +24,15 @@ FormOnTop=1
 [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dproj]
 ModuleType=TBaseProject

-[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas]
-ModuleType=TSourceModule
-FormState=0
-FormOnTop=0
-
 [default.htm]
 ModuleType=TURLModule

-[C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas]
-ModuleType=TSourceModule
-FormState=0
-FormOnTop=0
-
 [EditWindow0]
-ViewCount=5
+ViewCount=3
 CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas
 View0=0
 View1=1
 View2=2
-View3=3
-View4=4
 PercentageSizes=1
 Create=1
 Visible=1
@ -82,9 +69,9 @@ WelcomePageURL=bds:/default.htm
 [View1]
 CustomEditViewType=TEditView
 Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\MiniBrowser.dpr
-CursorX=73
-CursorY=100
-TopLine=79
+CursorX=1
+CursorY=120
+TopLine=100
 LeftCol=1
 Elisions=
 Bookmarks=
@ -92,17 +79,6 @@ EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\d

 [View2]
 CustomEditViewType=TEditView
-Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas
-CursorX=1
-CursorY=72
-TopLine=41
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uTestExtension.pas
-
-[View3]
-CustomEditViewType=TEditView
 Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\MiniBrowser\uMiniBrowser.pas
 CursorX=22
 CursorY=81
@ -112,17 +88,6 @@ Elisions=
 Bookmarks=
 EditViewName=Borland.FormDesignerView

-[View4]
-CustomEditViewType=TEditView
-Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas
-CursorX=85
-CursorY=370
-TopLine=344
-LeftCol=1
-Elisions=
-Bookmarks=
-EditViewName=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFChromium.pas
-
 [Watches]
 Count=0

@ -278,8 +243,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-121
-Top=-74
+Left=-148
+Top=-137
 Width=1844
 Height=3139
 MaxLeft=-1
@ -343,7 +308,7 @@ MaxLeft=-1
 MaxTop=-1
 ClientWidth=1898
 ClientHeight=5370
-TBDockHeight=7119
+TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
 StayOnTop=0
@ -352,7 +317,7 @@ SplitPos=111
 [PropInspDesignerSelection]
 ArrangeBy=Name
 SelectedItem=Items,
-ExpandedItems="LiveBindings Designer=0",MenuAnimation=0,Anchors=0,BevelEdges=0,Constraints=0,Font=0,LiveBindings=0,Margins=0
+ExpandedItems=Font=0,LiveBindings=0,"LiveBindings Designer=0",Margins=0,StyleElements=0

 [frmDesignPreview]
 PercentageSizes=1
@ -363,11 +328,11 @@ State=0
 Left=0
 Top=0
 Width=2000
-Height=6816
+Height=6861
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=6816
+ClientHeight=6861
 TBDockHeight=5964
 LRDockWidth=2508
 Dockable=1
@ -379,8 +344,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-946
-Top=1
+Left=-898
+Top=-137
 Width=2844
 Height=6200
 MaxLeft=-1
@ -398,8 +363,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-1152
-Top=243
+Left=-1026
+Top=-137
 Width=273
 Height=359
 MaxLeft=-1
@ -503,11 +468,11 @@ State=0
 Left=0
 Top=0
 Width=2336
-Height=942
+Height=1177
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2336
-ClientHeight=942
+ClientHeight=1177
 TBDockHeight=2321
 LRDockWidth=2820
 Dockable=1
@ -568,11 +533,11 @@ State=0
 Left=0
 Top=0
 Width=2000
-Height=6816
+Height=6861
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=6816
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=7148
 Dockable=1
@ -584,8 +549,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=249
-Top=709
+Left=0
+Top=0
 Width=2859
 Height=3206
 MaxLeft=-1
@ -651,11 +616,11 @@ State=0
 Left=0
 Top=0
 Width=2000
-Height=6816
+Height=6861
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=6816
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=5305
 Dockable=1
@ -716,7 +681,7 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=23
+Top=0
 Width=3820
 Height=1424
 MaxLeft=-1
@ -747,7 +712,7 @@ MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
 ClientHeight=4529
-TBDockHeight=7119
+TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
 StayOnTop=0
@ -771,7 +736,7 @@ MaxLeft=-1
 MaxTop=-1
 ClientWidth=1898
 ClientHeight=3498
-TBDockHeight=7119
+TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
 StayOnTop=0
@ -795,7 +760,7 @@ MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
 ClientHeight=4339
-TBDockHeight=7119
+TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
 StayOnTop=0
--- a/demos/MiniBrowser/MiniBrowser.identcache
+++ b/demos/MiniBrowser/MiniBrowser.identcache
--- a/demos/MiniBrowser/MiniBrowser.stat
+++ b/demos/MiniBrowser/MiniBrowser.stat
@ -1,10 +1,10 @@
 [Stats]
-EditorSecs=25302
-DesignerSecs=1840
-InspectorSecs=1291
-CompileSecs=1094770
-OtherSecs=3317
+EditorSecs=25810
+DesignerSecs=1933
+InspectorSecs=1304
+CompileSecs=1216616
+OtherSecs=4095
 StartTime=11/02/2017 10:51:15
 RealKeys=0
 EffectiveKeys=0
-DebugSecs=13179
+DebugSecs=15197
--- a/demos/SimpleBrowser/SimpleBrowser.dpr
+++ b/demos/SimpleBrowser/SimpleBrowser.dpr
@ -41,15 +41,18 @@ program SimpleBrowser;

 uses
  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
+  WinApi.Windows, Vcl.Forms,
  {$ELSE}
-  Forms,
+  Windows, Forms,
  {$ENDIF}
  uCEFApplication,
  uSimpleBrowser in 'uSimpleBrowser.pas' {Form1};

 {$R *.res}

+// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
+
 begin
  GlobalCEFApp := TCefApplication.Create;

--- a/demos/SimpleBrowser/SimpleBrowser.dproj
+++ b/demos/SimpleBrowser/SimpleBrowser.dproj
@ -133,12 +133,27 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
                    <Platform Name="iOSDevice64">
                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                    </Platform>
                    <Platform Name="iOSDevice32">
                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                    </Platform>
                </DeployClass>
                <DeployClass Name="ProjectOSXResource">
@ -492,27 +507,12 @@
                        <Operation>1</Operation>
                    </Platform>
                </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
+                <DeployClass Name="ProjectiOSDeviceResourceRules">
                    <Platform Name="iOSDevice64">
                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                    </Platform>
                    <Platform Name="iOSDevice32">
                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                    </Platform>
                </DeployClass>
                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
--- a/demos/SimpleBrowser/SimpleBrowser.dproj.local
+++ b/demos/SimpleBrowser/SimpleBrowser.dproj.local
@ -2,8 +2,8 @@
 <BorlandProject>
 	<Transactions>
    <Transaction>2017/01/22 14:37:05.000.577,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
-    <Transaction>2017/01/22 14:41:11.000.096,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\uSimpleBrowser.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm</Transaction>
-    <Transaction>2017/01/22 14:41:11.000.096,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\uSimpleBrowser.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
-    <Transaction>2017/01/22 14:41:18.000.226,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\SimpleBrowser.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj</Transaction>
+    <Transaction>2017/01/22 14:41:11.000.096,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\uSimpleBrowser.pas</Transaction>
+    <Transaction>2017/01/22 14:41:11.000.096,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\uSimpleBrowser.dfm</Transaction>
+    <Transaction>2017/01/22 14:41:18.000.226,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleBrowser\SimpleBrowser.dproj</Transaction>
  </Transactions>
 </BorlandProject>
--- a/demos/SimpleBrowser/SimpleBrowser.dsk
+++ b/demos/SimpleBrowser/SimpleBrowser.dsk
@ -11,20 +11,20 @@ File_8=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF
 File_9=TSourceModule,'C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\source\uCEFClient.pas',0,1,45,32,52,0,0,,

 [Modules]
-Module0=default.htm
-Module1=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\SimpleBrowser.dproj
+Module0=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\SimpleBrowser.dproj
+Module1=default.htm
 Count=2
 EditWindowCount=1

-[default.htm]
-ModuleType=TURLModule
-
 [C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\SimpleBrowser.dproj]
 ModuleType=TBaseProject

+[default.htm]
+ModuleType=TURLModule
+
 [EditWindow0]
 ViewCount=2
-CurrentView=0
+CurrentEditView=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\SimpleBrowser.dpr
 View0=0
 View1=1
 PercentageSizes=1
@ -44,16 +44,17 @@ DockedToMainForm=1
 BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0
 TopPanelSize=0
 LeftPanelSize=0
-RightPanelSize=0
+RightPanelSize=2000
+RightPanelClients=DockSite2
+RightPanelData=00000800010100000000AA1900000000000001D0070000000000000100000000A123000009000000446F636B5369746532FFFFFFFF
 BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B53697465313B36000000000000006E08000000000000FFFFFFFF
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001020200000009000000446F636B53697465310F0000004D65737361676556696577466F726D3B36000000000000020F0600000000000001000000003B3600000F0000004D65737361676556696577466F726DFFFFFFFF
 BottomMiddlePanelSize=0
 BottomMiddlePanelClients=DockSite0,GraphDrawingModel
 BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF
 TabDockLeftClients=PropertyInspector=0,DockSite3=1
-TabDockBottomClients=MessageView=0
-TabDockRightClients=DockSite4=0,DockSite2=1
+TabDockRightClients=DockSite4=0

 [View0]
 CustomEditViewType=TWelcomePageView
@ -62,8 +63,8 @@ WelcomePageURL=bds:/default.htm
 [View1]
 CustomEditViewType=TEditView
 Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleBrowser\SimpleBrowser.dpr
-CursorX=69
-CursorY=58
+CursorX=67
+CursorY=64
 TopLine=19
 LeftCol=1
 Elisions=
@ -84,11 +85,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=213
 LRDockWidth=13602
 Dockable=1
@ -132,11 +133,11 @@ State=0
 Left=0
 Top=0
 Width=2000
-Height=8587
+Height=8868
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=8587
+ClientHeight=8868
 TBDockHeight=5897
 LRDockWidth=2352
 Dockable=1
@ -149,14 +150,14 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=892
-Width=2773
-Height=1973
+Top=23
+Width=10000
+Height=1345
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=2773
-ClientHeight=1973
-TBDockHeight=1973
+ClientWidth=10000
+ClientHeight=1345
+TBDockHeight=1345
 LRDockWidth=2773
 Dockable=1
 StayOnTop=0
@ -169,12 +170,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6738
+Width=2000
+Height=4339
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6738
+ClientWidth=2000
+ClientHeight=4339
 TBDockHeight=7152
 LRDockWidth=2000
 Dockable=1
@ -224,8 +225,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
-Top=-30
+Left=-148
+Top=-137
 Width=1844
 Height=3139
 MaxLeft=-1
@ -281,14 +282,14 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=78
-Top=386
+Left=0
+Top=362
 Width=1898
-Height=7164
+Height=5370
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=1898
-ClientHeight=7164
+ClientHeight=5370
 TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
@ -303,12 +304,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=5964
 LRDockWidth=2508
 Dockable=1
@ -320,8 +321,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-1210
-Top=-6
+Left=-898
+Top=-137
 Width=2844
 Height=6200
 MaxLeft=-1
@ -339,8 +340,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
-Top=287
+Left=-1026
+Top=-137
 Width=273
 Height=359
 MaxLeft=-1
@ -364,11 +365,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=415
 LRDockWidth=4953
 Dockable=1
@ -383,11 +384,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=213
 LRDockWidth=7406
 Dockable=1
@ -406,11 +407,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=1536
 LRDockWidth=3484
 Dockable=1
@ -425,11 +426,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=2063
 LRDockWidth=3484
 Dockable=1
@ -444,11 +445,11 @@ State=0
 Left=0
 Top=0
 Width=2336
-Height=942
+Height=1177
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2336
-ClientHeight=942
+ClientHeight=1177
 TBDockHeight=2321
 LRDockWidth=2820
 Dockable=1
@ -508,12 +509,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=7148
 Dockable=1
@ -525,8 +526,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=249
-Top=709
+Left=0
+Top=0
 Width=2859
 Height=3206
 MaxLeft=-1
@ -547,11 +548,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=1547
 LRDockWidth=8742
 Dockable=1
@ -572,12 +573,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1773
-Height=6738
+Width=1898
+Height=9170
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
-ClientHeight=6738
+ClientWidth=1898
+ClientHeight=9170
 TBDockHeight=3677
 LRDockWidth=1898
 Dockable=1
@ -591,12 +592,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=5305
 Dockable=1
@ -657,14 +658,14 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=23
+Top=0
 Width=3820
-Height=2052
+Height=1424
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=2052
-TBDockHeight=2052
+ClientHeight=1424
+TBDockHeight=1424
 LRDockWidth=3820
 Dockable=1
 StayOnTop=0
@ -673,21 +674,21 @@ ActiveTabID=DebugLogView
 TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow

 [DockSite2]
-HostDockSite=RightTabDock
+HostDockSite=DockRightPanel
 DockSiteType=1
 PercentageSizes=1
 Create=1
-Visible=0
+Visible=1
 Docked=1
 State=0
-Left=4
-Top=24
+Left=0
+Top=23
 Width=2000
-Height=8890
+Height=9170
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=8890
+ClientHeight=9170
 TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
@ -705,13 +706,13 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=0
+Top=23
 Width=1898
-Height=7164
+Height=9170
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
-ClientHeight=6738
+ClientWidth=1898
+ClientHeight=9170
 TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
@ -729,13 +730,13 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=0
+Top=454
 Width=2000
-Height=7164
+Height=4339
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6738
+ClientWidth=2000
+ClientHeight=4339
 TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
--- a/demos/SimpleBrowser/SimpleBrowser.stat
+++ b/demos/SimpleBrowser/SimpleBrowser.stat
@ -1,9 +1,9 @@
 [Stats]
-EditorSecs=2509
+EditorSecs=2533
 DesignerSecs=267
 InspectorSecs=136
-CompileSecs=124554
-OtherSecs=506
+CompileSecs=128599
+OtherSecs=513
 StartTime=22/01/2017 14:51:01
 RealKeys=0
 EffectiveKeys=0
--- a/demos/SimpleBrowser/SimpleBrowser_D7.dpr
+++ b/demos/SimpleBrowser/SimpleBrowser_D7.dpr
@ -41,9 +41,9 @@ program SimpleBrowser_D7;

 uses
  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
+  WinApi.Windows, Vcl.Forms,
  {$ELSE}
-  Forms,
+  Windows, Forms,
  {$ENDIF}
  uCEFApplication,
  uSimpleBrowser in 'uSimpleBrowser.pas' {Form1};
@ -51,6 +51,9 @@ uses

 {$R *.res}

+// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
+
 begin
  GlobalCEFApp := TCefApplication.Create;

--- a/demos/SimpleOSRBrowser/SimpleOSRBrowser.dpr
+++ b/demos/SimpleOSRBrowser/SimpleOSRBrowser.dpr
@ -41,15 +41,18 @@ program SimpleOSRBrowser;

 uses
  {$IFDEF DELPHI16_UP}
-  Vcl.Forms,
+  WinApi.Windows, Vcl.Forms,
  {$ELSE}
-  Forms,
+  Windows, Forms,
  {$ENDIF}
  uCEFApplication,
  uSimpleOSRBrowser in 'uSimpleOSRBrowser.pas' {Form1};

 {$R *.res}

+// CEF3 needs to set the LARGEADDRESSAWARE flag which allows 32-bit processes to use up to 3GB of RAM.
+{$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE}
+
 begin
  GlobalCEFApp                            := TCefApplication.Create;
  GlobalCEFApp.WindowlessRenderingEnabled := True;
--- a/demos/SimpleOSRBrowser/SimpleOSRBrowser.dproj
+++ b/demos/SimpleOSRBrowser/SimpleOSRBrowser.dproj
@ -133,27 +133,12 @@
                        <Overwrite>true</Overwrite>
                    </Platform>
                </DeployFile>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
+                <DeployClass Name="ProjectiOSDeviceResourceRules">
                    <Platform Name="iOSDevice64">
                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                    </Platform>
                    <Platform Name="iOSDevice32">
                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                    </Platform>
                </DeployClass>
                <DeployClass Name="ProjectOSXResource">
@ -507,12 +492,27 @@
                        <Operation>1</Operation>
                    </Platform>
                </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
                    <Platform Name="iOSDevice64">
                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                    </Platform>
                    <Platform Name="iOSDevice32">
                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                    </Platform>
                </DeployClass>
                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
--- a/demos/SimpleOSRBrowser/SimpleOSRBrowser.dproj.local
+++ b/demos/SimpleOSRBrowser/SimpleOSRBrowser.dproj.local
@ -2,8 +2,8 @@
 <BorlandProject>
 	<Transactions>
    <Transaction>2017/01/22 17:26:58.000.836,=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
-    <Transaction>2017/01/22 17:28:20.000.762,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\uSimpleOSRBrowser.pas</Transaction>
-    <Transaction>2017/01/22 17:28:20.000.762,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\uSimpleOSRBrowser.dfm</Transaction>
-    <Transaction>2017/01/22 17:28:25.000.780,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\SimpleOSRBrowser.dproj</Transaction>
+    <Transaction>2017/01/22 17:28:20.000.762,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\uSimpleOSRBrowser.pas=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
+    <Transaction>2017/01/22 17:28:20.000.762,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\uSimpleOSRBrowser.dfm=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Unit1.dfm</Transaction>
+    <Transaction>2017/01/22 17:28:25.000.780,C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi demos\SimpleOSRBrowser\SimpleOSRBrowser.dproj=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\Project1.dproj</Transaction>
  </Transactions>
 </BorlandProject>
--- a/demos/SimpleOSRBrowser/SimpleOSRBrowser.dsk
+++ b/demos/SimpleOSRBrowser/SimpleOSRBrowser.dsk
@ -44,16 +44,17 @@ DockedToMainForm=1
 BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0
 TopPanelSize=0
 LeftPanelSize=0
-RightPanelSize=0
-BottomPanelSize=0
-BottomPanelClients=DockSite1
-BottomPanelData=0000080001000100000009000000446F636B53697465313B36000000000000006E08000000000000FFFFFFFF
+RightPanelSize=2000
+RightPanelClients=DockSite2
+RightPanelData=00000800010100000000551500000000000001D00700000000000001000000009D1D000009000000446F636B5369746532FFFFFFFF
+BottomPanelSize=1475
+BottomPanelClients=DockSite1,MessageView
+BottomPanelData=0000080001020100000009000000446F636B53697465313B3600000000000002C30500000000000001000000003B3600000F0000004D65737361676556696577466F726DFFFFFFFF
 BottomMiddlePanelSize=0
 BottomMiddlePanelClients=DockSite0,GraphDrawingModel
 BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779D1D00000000000002F306000000000000FFFFFFFF
 TabDockLeftClients=PropertyInspector=0,DockSite3=1
-TabDockBottomClients=MessageView=0
-TabDockRightClients=DockSite4=0,DockSite2=1
+TabDockRightClients=DockSite4=0

 [View0]
 CustomEditViewType=TWelcomePageView
@ -62,8 +63,8 @@ WelcomePageURL=bds:/default.htm
 [View1]
 CustomEditViewType=TEditView
 Module=C:\Users\usuario\Documents\Embarcadero\Studio\Projects\CEF4Delphi\demos\SimpleOSRBrowser\SimpleOSRBrowser.dpr
-CursorX=1
-CursorY=63
+CursorX=70
+CursorY=61
 TopLine=22
 LeftCol=1
 Elisions=
@ -84,11 +85,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=213
 LRDockWidth=13602
 Dockable=1
@ -132,11 +133,11 @@ State=0
 Left=0
 Top=0
 Width=2000
-Height=8587
+Height=7276
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=8587
+ClientHeight=7276
 TBDockHeight=5897
 LRDockWidth=2352
 Dockable=1
@ -145,18 +146,18 @@ StayOnTop=0
 [MessageView]
 PercentageSizes=1
 Create=1
-Visible=0
+Visible=1
 Docked=1
 State=0
 Left=0
-Top=892
-Width=2773
-Height=1973
+Top=23
+Width=10000
+Height=1267
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=2773
-ClientHeight=1973
-TBDockHeight=1973
+ClientWidth=10000
+ClientHeight=1267
+TBDockHeight=1267
 LRDockWidth=2773
 Dockable=1
 StayOnTop=0
@ -169,12 +170,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6738
+Width=2000
+Height=4339
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6738
+ClientWidth=2000
+ClientHeight=4339
 TBDockHeight=7152
 LRDockWidth=2000
 Dockable=1
@ -224,8 +225,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
-Top=-30
+Left=-148
+Top=-137
 Width=1844
 Height=3139
 MaxLeft=-1
@ -281,14 +282,14 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=78
-Top=386
+Left=0
+Top=362
 Width=1898
-Height=7164
+Height=5370
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=1898
-ClientHeight=7164
+ClientHeight=5370
 TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
@ -303,12 +304,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=5964
 LRDockWidth=2508
 Dockable=1
@ -320,8 +321,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-1210
-Top=-6
+Left=-898
+Top=-137
 Width=2844
 Height=6200
 MaxLeft=-1
@ -339,8 +340,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=-8
-Top=287
+Left=-1026
+Top=-137
 Width=273
 Height=359
 MaxLeft=-1
@ -364,11 +365,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=415
 LRDockWidth=4953
 Dockable=1
@ -383,11 +384,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=213
 LRDockWidth=7406
 Dockable=1
@ -406,11 +407,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=1536
 LRDockWidth=3484
 Dockable=1
@ -425,11 +426,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=2063
 LRDockWidth=3484
 Dockable=1
@ -444,11 +445,11 @@ State=0
 Left=0
 Top=0
 Width=2336
-Height=942
+Height=1177
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2336
-ClientHeight=942
+ClientHeight=1177
 TBDockHeight=2321
 LRDockWidth=2820
 Dockable=1
@ -508,12 +509,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=7148
 Dockable=1
@ -525,8 +526,8 @@ Create=1
 Visible=0
 Docked=1
 State=0
-Left=249
-Top=709
+Left=0
+Top=0
 Width=2859
 Height=3206
 MaxLeft=-1
@ -547,11 +548,11 @@ State=0
 Left=0
 Top=0
 Width=3820
-Height=1749
+Height=1121
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=1749
+ClientHeight=1121
 TBDockHeight=1547
 LRDockWidth=8742
 Dockable=1
@ -572,12 +573,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1773
-Height=6738
+Width=1898
+Height=9170
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
-ClientHeight=6738
+ClientWidth=1898
+ClientHeight=9170
 TBDockHeight=3677
 LRDockWidth=1898
 Dockable=1
@ -591,12 +592,12 @@ Docked=1
 State=0
 Left=0
 Top=0
-Width=1875
-Height=6435
+Width=2000
+Height=6861
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6435
+ClientWidth=2000
+ClientHeight=6861
 TBDockHeight=4888
 LRDockWidth=5305
 Dockable=1
@ -657,14 +658,14 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=23
+Top=0
 Width=3820
-Height=2052
+Height=1424
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=3820
-ClientHeight=2052
-TBDockHeight=2052
+ClientHeight=1424
+TBDockHeight=1424
 LRDockWidth=3820
 Dockable=1
 StayOnTop=0
@ -673,21 +674,21 @@ ActiveTabID=DebugLogView
 TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow

 [DockSite2]
-HostDockSite=RightTabDock
+HostDockSite=DockRightPanel
 DockSiteType=1
 PercentageSizes=1
 Create=1
-Visible=0
+Visible=1
 Docked=1
 State=0
-Left=4
-Top=24
+Left=0
+Top=23
 Width=2000
-Height=8890
+Height=7578
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=2000
-ClientHeight=8890
+ClientHeight=7578
 TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
@ -705,13 +706,13 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=0
+Top=23
 Width=1898
-Height=7164
+Height=9170
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1773
-ClientHeight=6738
+ClientWidth=1898
+ClientHeight=9170
 TBDockHeight=7164
 LRDockWidth=1898
 Dockable=1
@ -729,13 +730,13 @@ Visible=0
 Docked=1
 State=0
 Left=0
-Top=0
+Top=454
 Width=2000
-Height=7164
+Height=4339
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=1875
-ClientHeight=6738
+ClientWidth=2000
+ClientHeight=4339
 TBDockHeight=7164
 LRDockWidth=2000
 Dockable=1
--- a/demos/SimpleOSRBrowser/SimpleOSRBrowser.stat
+++ b/demos/SimpleOSRBrowser/SimpleOSRBrowser.stat
@ -1,9 +1,9 @@
 [Stats]
-EditorSecs=2210
+EditorSecs=2227
 DesignerSecs=210
 InspectorSecs=61
-CompileSecs=127489
-OtherSecs=358
+CompileSecs=133453
+OtherSecs=367
 StartTime=22/01/2017 17:35:20
 RealKeys=0
 EffectiveKeys=0