Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 78371fd

Browse files
livecodeianlivecodeian
committed
Merge branch 'refactor-graphics_performance' into refactor-graphics_performance_merge
Conflicts: engine/src/control.cpp engine/src/group.cpp engine/src/mac-window.mm libgraphics/libgraphics-mobile.xcodeproj/project.pbxproj libgraphics/libgraphics.xcodeproj/project.pbxproj
2 parents 9aff191 + e175560 commit 78371fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1617
-680
lines changed

‎engine/Android.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := $(addprefix src/,\
3232
object.cpp objectpropsets.cpp objptr.cpp operator.cpp paragraf.cpp paragrafattr.cpp param.cpp \
3333
property.cpp pickle.cpp \
3434
regex.cpp \
35+
region.cpp \
3536
resolution.cpp \
3637
scriptpt.cpp \
3738
scrolbar.cpp scrollbardraw.cpp sellst.cpp \
@@ -53,7 +54,7 @@ LOCAL_SRC_FILES := $(addprefix src/,\
5354
bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp capsule.cpp \
5455
externalv0.cpp externalv1.cpp \
5556
mode_standalone.cpp lextable.cpp eventqueue.cpp sha1.cpp stacke.cpp \
56-
name.cpp redraw.cpp tilecache.cpp tilecachesw.cpp tilecachegl.cpp sysregion.cpp \
57+
name.cpp redraw.cpp tilecache.cpp tilecachesw.cpp tilecachegl.cpp \
5758
sysunxdate.cpp sysunxrandom.cpp sysspec.cpp stackcache.cpp uuid.cpp \
5859
quicktime.cpp \
5960
mblad.cpp mblalert.cpp mblbusyindicator.cpp mblcalendar.cpp mblcontact.cpp mblcontrol.cpp \

‎engine/Makefile.kernel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ SOURCES=\
2626
object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
2727
property.cpp pickle.cpp \
2828
regex.cpp \
29+
region.cpp \
2930
resolution.cpp \
3031
scriptpt.cpp \
3132
scrolbar.cpp \

‎engine/Makefile.kernel-server‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ SOURCES=\
2424
object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
2525
property.cpp pickle.cpp \
2626
regex.cpp \
27+
region.cpp \
2728
resolution.cpp \
2829
scriptpt.cpp \
2930
scrolbar.cpp \
@@ -51,7 +52,7 @@ SOURCES=\
5152
sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
5253
srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvposix.cpp srvdebug.cpp \
5354
srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp srvtheme.cpp \
54-
eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
55+
eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp tilecache.cpp tilecachesw.cpp \
5556
fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp \
5657
graphicscontext.cpp lnxflst.cpp lnxflstold.cpp quicktime.cpp
5758

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@
235235
4DABCE4B15ECD4B50085E214 /* styledtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF061040ADFC00CAC7EF /* styledtext.cpp */; };
236236
4DABCE4C15ECD4B50085E214 /* surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3E18D1040BDF000CAC7EF /* surface.cpp */; };
237237
4DABCE4D15ECD4B50085E214 /* syscfdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC8F613DD90CE006233A4 /* syscfdate.cpp */; };
238-
4DABCE4E15ECD4B50085E214 /* sysregion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D6E59571408344300EE960D /* sysregion.cpp */; };
239238
4DABCE4F15ECD4B50085E214 /* sysspec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DE7ED6413B33CEA002634F5 /* sysspec.cpp */; };
240239
4DABCE5015ECD4B50085E214 /* sysunxnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6D0A371407D04D003B1BA3 /* sysunxnetwork.cpp */; };
241240
4DABCE5115ECD4B50085E214 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF091040ADFC00CAC7EF /* text.cpp */; };
@@ -279,6 +278,7 @@
279278
E8C22E57177B2884003785D3 /* imagelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C22E55177B2884003785D3 /* imagelist.cpp */; };
280279
E8C22E73177B2960003785D3 /* graphicscontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C22E71177B2960003785D3 /* graphicscontext.cpp */; };
281280
E8C22E75177B2B53003785D3 /* mbltheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8C22E74177B2B53003785D3 /* mbltheme.cpp */; };
281+
E8F7445A194071C400DCCE28 /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8F74459194071C400DCCE28 /* region.cpp */; };
282282
F670DB6A147D462B008FEA1E /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F62512621455C7F100BDAACF /* CoreMedia.framework */; };
283283
F6DF4CA615597DD000450B64 /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6DF4CA515597DD000450B64 /* EventKit.framework */; };
284284
F6DF4CA815597DEB00450B64 /* EventKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6DF4CA715597DEA00450B64 /* EventKitUI.framework */; };
@@ -551,7 +551,6 @@
551551
4D6E58E21407E94200EE960D /* tilecache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tilecache.cpp; path = src/tilecache.cpp; sourceTree = "<group>"; };
552552
4D6E5951140833FA00EE960D /* redraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = redraw.h; path = src/redraw.h; sourceTree = "<group>"; };
553553
4D6E5952140833FA00EE960D /* redraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = redraw.cpp; path = src/redraw.cpp; sourceTree = "<group>"; };
554-
4D6E59571408344300EE960D /* sysregion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysregion.cpp; path = src/sysregion.cpp; sourceTree = "<group>"; };
555554
4D6E5959140834BD00EE960D /* region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = region.h; path = src/region.h; sourceTree = "<group>"; };
556555
4D6F954B12AC157100026A72 /* mbliphonedialog.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonedialog.mm; path = src/mbliphonedialog.mm; sourceTree = "<group>"; };
557556
4D7651611342243D0042EB2D /* mbliphonelocation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonelocation.mm; path = src/mbliphonelocation.mm; sourceTree = "<group>"; };
@@ -957,6 +956,7 @@
957956
E8EB28CF147C0DF20081452B /* mblandroidsensor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidsensor.cpp; path = src/mblandroidsensor.cpp; sourceTree = "<group>"; };
958957
E8EB28D0147D12660081452B /* SensorModule.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = SensorModule.java; sourceTree = "<group>"; };
959958
E8EB28D1147D36790081452B /* ScreenOrientationEventListener.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = ScreenOrientationEventListener.java; sourceTree = "<group>"; };
959+
E8F74459194071C400DCCE28 /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = src/region.cpp; sourceTree = "<group>"; };
960960
E8F7CAE91497ACF600A5D60B /* NetworkModule.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = NetworkModule.java; sourceTree = "<group>"; };
961961
F60A5A3F148003E9000982BF /* mblbusyindicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblbusyindicator.cpp; path = src/mblbusyindicator.cpp; sourceTree = "<group>"; };
962962
F60A5A4114800404000982BF /* mbliphonebusyindicator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonebusyindicator.mm; path = src/mbliphonebusyindicator.mm; sourceTree = "<group>"; };
@@ -1354,6 +1354,7 @@
13541354
E81AC137170C8E1000315861 /* Core - Graphics */ = {
13551355
isa = PBXGroup;
13561356
children = (
1357+
E8F74459194071C400DCCE28 /* region.cpp */,
13571358
4DD3DDAD1040AC1A00CAC7EF /* bitmapeffect.cpp */,
13581359
4DD3DDB71040AC1A00CAC7EF /* bitmapeffect.h */,
13591360
4DD3DDB61040AC1A00CAC7EF /* bitmapeffectblur.cpp */,
@@ -1644,7 +1645,6 @@
16441645
4DD3DEA31040AD9300CAC7EF /* osspec.h */,
16451646
4DFFC8F613DD90CE006233A4 /* syscfdate.cpp */,
16461647
4D01C36F13CE3C810041A281 /* sysdefs.h */,
1647-
4D6E59571408344300EE960D /* sysregion.cpp */,
16481648
4DE7ED6413B33CEA002634F5 /* sysspec.cpp */,
16491649
4DD3DF041040ADFC00CAC7EF /* System.h */,
16501650
4C6D0A371407D04D003B1BA3 /* sysunxnetwork.cpp */,
@@ -2109,6 +2109,7 @@
21092109
4DABCDC115ECD4700085E214 /* fiber.cpp in Sources */,
21102110
4DABCDC315ECD4700085E214 /* field.cpp in Sources */,
21112111
4DABCDC415ECD4700085E214 /* fieldf.cpp in Sources */,
2112+
E8F7445A194071C400DCCE28 /* region.cpp in Sources */,
21122113
4DABCDC515ECD4700085E214 /* fieldh.cpp in Sources */,
21132114
4DABCDC615ECD4700085E214 /* fieldhtml.cpp in Sources */,
21142115
4DABCDC715ECD4700085E214 /* fieldrtf.cpp in Sources */,
@@ -2252,7 +2253,6 @@
22522253
4DABCE4B15ECD4B50085E214 /* styledtext.cpp in Sources */,
22532254
4DABCE4C15ECD4B50085E214 /* surface.cpp in Sources */,
22542255
4DABCE4D15ECD4B50085E214 /* syscfdate.cpp in Sources */,
2255-
4DABCE4E15ECD4B50085E214 /* sysregion.cpp in Sources */,
22562256
4DABCE4F15ECD4B50085E214 /* sysspec.cpp in Sources */,
22572257
4DABCE5015ECD4B50085E214 /* sysunxnetwork.cpp in Sources */,
22582258
4DABCE5115ECD4B50085E214 /* text.cpp in Sources */,

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@
188188
4D1F9DA1171C682E0091C6CB /* srvsession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E86A04F6142A49EF005ECD82 /* srvsession.cpp */; };
189189
4D1F9DA2171C682E0091C6CB /* redraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB66701413A02000E5C84C /* redraw.cpp */; };
190190
4D1F9DA3171C682E0091C6CB /* tilecache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB666D14139FF500E5C84C /* tilecache.cpp */; };
191-
4D1F9DA4171C682E0091C6CB /* sysregion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB66521413990400E5C84C /* sysregion.cpp */; };
192191
4D1F9DA5171C682E0091C6CB /* tilecachesw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D432F1E141A2DFE001164F9 /* tilecachesw.cpp */; };
193192
4D1F9DA6171C682E0091C6CB /* paragrafattr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1535614E7FB91009FA80E /* paragrafattr.cpp */; };
194193
4D1F9DA7171C682E0091C6CB /* fieldstyledtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1536114E7FE1D009FA80E /* fieldstyledtext.cpp */; };
@@ -370,7 +369,6 @@
370369
4DCB65721653B2F700E438E6 /* stackcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DCB65711653B2F700E438E6 /* stackcache.cpp */; };
371370
4DCFFD1C10CE8F5800FA2262 /* osxtextlayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DCFFD1B10CE8F5800FA2262 /* osxtextlayout.cpp */; };
372371
4DCFFD2E10CE927700FA2262 /* iquantize_new.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DCFFD2D10CE927700FA2262 /* iquantize_new.cpp */; };
373-
4DDB66591413993500E5C84C /* sysosxregion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB66581413993500E5C84C /* sysosxregion.cpp */; };
374372
4DDB666F14139FF500E5C84C /* tilecache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB666D14139FF500E5C84C /* tilecache.cpp */; };
375373
4DDB66721413A02000E5C84C /* redraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDB66701413A02000E5C84C /* redraw.cpp */; };
376374
4DDC26C9122692B10071CB31 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5881C10B80C7C300200116 /* Quartz.framework */; };
@@ -530,6 +528,7 @@
530528
E8252264174E2BF500055329 /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E8AF4895174D5563000B2F9E /* libskia.a */; };
531529
E85130F4180D9969004D1DB4 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E85130F3180D9969004D1DB4 /* image_rep_densitymapped.cpp */; };
532530
E85130F5180D9969004D1DB4 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E85130F3180D9969004D1DB4 /* image_rep_densitymapped.cpp */; };
531+
E87FAFEC1924F25000ED338B /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E87FAFEB1924F24300ED338B /* region.cpp */; };
533532
E88869AC180D63FC0026BFDA /* stackview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8988A8917FDD5B700F640F4 /* stackview.cpp */; };
534533
E8988A8A17FDD5B700F640F4 /* stackview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8988A8917FDD5B700F640F4 /* stackview.cpp */; };
535534
E8A554B11785A70600DABC1A /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C10D82916BFADB800D25197 /* libgraphics.a */; };
@@ -546,6 +545,7 @@
546545
E8D7F8471785A99900EC051A /* srvtheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8D7F8461785A99900EC051A /* srvtheme.cpp */; };
547546
E8DDE5DF16C2B1A7007367E4 /* image_rep_resampled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8DDE5DD16C2B1A7007367E4 /* image_rep_resampled.cpp */; };
548547
E8DDE5E016C2B1A7007367E4 /* image_rep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8DDE5DE16C2B1A7007367E4 /* image_rep.cpp */; };
548+
E8F8E10819544F7800E5164E /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E87FAFEB1924F24300ED338B /* region.cpp */; };
549549
/* End PBXBuildFile section */
550550

551551
/* Begin PBXContainerItemProxy section */
@@ -1428,7 +1428,6 @@
14281428
4DD54D68134F594E00981610 /* mblmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblmain.cpp; path = src/mblmain.cpp; sourceTree = "<group>"; };
14291429
4DD54D69134F594E00981610 /* mblspec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblspec.cpp; path = src/mblspec.cpp; sourceTree = "<group>"; };
14301430
4DD54D6A134F594E00981610 /* mblstack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblstack.cpp; path = src/mblstack.cpp; sourceTree = "<group>"; };
1431-
4DDB66521413990400E5C84C /* sysregion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysregion.cpp; path = src/sysregion.cpp; sourceTree = "<group>"; };
14321431
4DDB66531413990400E5C84C /* sysunxdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysunxdate.cpp; path = src/sysunxdate.cpp; sourceTree = "<group>"; };
14331432
4DDB66541413990400E5C84C /* sysw32network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysw32network.cpp; path = src/sysw32network.cpp; sourceTree = "<group>"; };
14341433
4DDB66551413990400E5C84C /* sysw32region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysw32region.cpp; path = src/sysw32region.cpp; sourceTree = "<group>"; };
@@ -1532,6 +1531,7 @@
15321531
E86A04F7142A49EF005ECD82 /* srvsession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = srvsession.h; path = src/srvsession.h; sourceTree = "<group>"; };
15331532
E86D598F170AEE0000060AED /* deploysecurity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = deploysecurity.h; path = src/deploysecurity.h; sourceTree = "<group>"; };
15341533
E86D59AE170AF0E000060AED /* deploysecurity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = deploysecurity.cpp; path = src/deploysecurity.cpp; sourceTree = "<group>"; };
1534+
E87FAFEB1924F24300ED338B /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = src/region.cpp; sourceTree = "<group>"; };
15351535
E8988A8917FDD5B700F640F4 /* stackview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stackview.cpp; path = src/stackview.cpp; sourceTree = "<group>"; };
15361536
E8A49103170F16D000769C7A /* name.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = name.h; path = src/name.h; sourceTree = "<group>"; };
15371537
E8A49104170F16D000769C7A /* rawarray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rawarray.h; path = src/rawarray.h; sourceTree = "<group>"; };
@@ -2435,7 +2435,6 @@
24352435
4DFD486413BA28BF008DB91F /* System */ = {
24362436
isa = PBXGroup;
24372437
children = (
2438-
4DDB66521413990400E5C84C /* sysregion.cpp */,
24392438
4DDB66581413993500E5C84C /* sysosxregion.cpp */,
24402439
4DB32230174BD08E00046FFE /* sysosxrandom.cpp */,
24412440
4DDB66531413990400E5C84C /* sysunxdate.cpp */,
@@ -2489,9 +2488,9 @@
24892488
4D592DEA14EED23600EADBB6 /* fonttable.cpp */,
24902489
4DB902510DAA5C980014A170 /* gradient.cpp */,
24912490
4DB902520DAA5C980014A170 /* gradient.h */,
2491+
4CC55320180D546000C10387 /* graphics_util.h */,
24922492
4C10D76D16BF9BFA00D25197 /* graphicscontext.cpp */,
24932493
4C10D76E16BF9BFA00D25197 /* graphicscontext.h */,
2494-
4CC55320180D546000C10387 /* graphics_util.h */,
24952494
E8B5BB1216DF77DF00CA02FB /* imagelist.cpp */,
24962495
E8B5BB1316DF77DF00CA02FB /* imagelist.h */,
24972496
4D587E370B8096FD00200116 /* mctheme.cpp */,
@@ -2509,6 +2508,7 @@
25092508
4D2192330C6386C90027A96D /* printer.h */,
25102509
4DDB66701413A02000E5C84C /* redraw.cpp */,
25112510
4DDB66711413A02000E5C84C /* redraw.h */,
2511+
E87FAFEB1924F24300ED338B /* region.cpp */,
25122512
E8A49106170F179000769C7A /* region.h */,
25132513
E82206E0184F810A00117D10 /* resolution.cpp */,
25142514
E8D7F8C21785D82F00EC051A /* resolution.h */,
@@ -3529,7 +3529,6 @@
35293529
4D1F9DA1171C682E0091C6CB /* srvsession.cpp in Sources */,
35303530
4D1F9DA2171C682E0091C6CB /* redraw.cpp in Sources */,
35313531
4D1F9DA3171C682E0091C6CB /* tilecache.cpp in Sources */,
3532-
4D1F9DA4171C682E0091C6CB /* sysregion.cpp in Sources */,
35333532
4D1F9DA5171C682E0091C6CB /* tilecachesw.cpp in Sources */,
35343533
4D1F9DA6171C682E0091C6CB /* paragrafattr.cpp in Sources */,
35353534
4D1F9DA7171C682E0091C6CB /* fieldstyledtext.cpp in Sources */,
@@ -3538,6 +3537,7 @@
35383537
4D1F9DAA171C682E0091C6CB /* fieldhtml.cpp in Sources */,
35393538
4D1F9DAC171C682E0091C6CB /* ibmp.cpp in Sources */,
35403539
4D1F9DAD171C682E0091C6CB /* image_rep.cpp in Sources */,
3540+
E8F8E10819544F7800E5164E /* region.cpp in Sources */,
35413541
4D1F9DAE171C682E0091C6CB /* image_rep_encoded.cpp in Sources */,
35423542
4D1F9DAF171C682E0091C6CB /* image_rep_mutable.cpp in Sources */,
35433543
4D1F9DB0171C682E0091C6CB /* image_rep_resampled.cpp in Sources */,
@@ -3762,7 +3762,6 @@
37623762
4DFFC7E713DD8AB9006233A4 /* objectpropsets.cpp in Sources */,
37633763
4DFFC7EF13DD8AFC006233A4 /* name.cpp in Sources */,
37643764
4D05B91013E06AB3001CD82A /* dskmain.cpp in Sources */,
3765-
4DDB66591413993500E5C84C /* sysosxregion.cpp in Sources */,
37663765
4DDB666F14139FF500E5C84C /* tilecache.cpp in Sources */,
37673766
4DDB66721413A02000E5C84C /* redraw.cpp in Sources */,
37683767
4D432F1F141A2DFE001164F9 /* tilecachesw.cpp in Sources */,
@@ -3816,6 +3815,7 @@
38163815
4DAF5C8718C0E76500B9713C /* mac-scripting.mm in Sources */,
38173816
4D87710018C8B30700A88AF9 /* quicktime.cpp in Sources */,
38183817
1DC1249518FC422B00C2FEF3 /* quicktimestubs.mac.cpp in Sources */,
3818+
E87FAFEC1924F25000ED338B /* region.cpp in Sources */,
38193819
);
38203820
runOnlyForDeploymentPostprocessing = 0;
38213821
};

‎engine/kernel-server.vcproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,14 @@
283283
RelativePath=".\src\redraw.h"
284284
>
285285
</File>
286+
<File
287+
RelativePath=".\src\region.cpp"
288+
>
289+
</File>
290+
<File
291+
RelativePath=".\src\region.h"
292+
>
293+
</File>
286294
<File
287295
RelativePath=".\src\resolution.cpp"
288296
>
@@ -1419,10 +1427,6 @@
14191427
RelativePath=".\src\sysdefs.h"
14201428
>
14211429
</File>
1422-
<File
1423-
RelativePath=".\src\sysregion.cpp"
1424-
>
1425-
</File>
14261430
<File
14271431
RelativePath=".\src\sysspec.cpp"
14281432
>

‎engine/kernel.vcproj‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,10 @@
10101010
RelativePath=".\src\redraw.h"
10111011
>
10121012
</File>
1013+
<File
1014+
RelativePath=".\src\region.cpp"
1015+
>
1016+
</File>
10131017
<File
10141018
RelativePath=".\src\region.h"
10151019
>
@@ -5072,46 +5076,6 @@
50725076
/>
50735077
</FileConfiguration>
50745078
</File>
5075-
<File
5076-
RelativePath=".\src\sysosxregion.cpp"
5077-
>
5078-
<FileConfiguration
5079-
Name="Debug|Win32"
5080-
ExcludedFromBuild="true"
5081-
>
5082-
<Tool
5083-
Name="VCCLCompilerTool"
5084-
/>
5085-
</FileConfiguration>
5086-
<FileConfiguration
5087-
Name="Release|Win32"
5088-
ExcludedFromBuild="true"
5089-
>
5090-
<Tool
5091-
Name="VCCLCompilerTool"
5092-
/>
5093-
</FileConfiguration>
5094-
</File>
5095-
<File
5096-
RelativePath=".\src\sysregion.cpp"
5097-
>
5098-
<FileConfiguration
5099-
Name="Debug|Win32"
5100-
ExcludedFromBuild="true"
5101-
>
5102-
<Tool
5103-
Name="VCCLCompilerTool"
5104-
/>
5105-
</FileConfiguration>
5106-
<FileConfiguration
5107-
Name="Release|Win32"
5108-
ExcludedFromBuild="true"
5109-
>
5110-
<Tool
5111-
Name="VCCLCompilerTool"
5112-
/>
5113-
</FileConfiguration>
5114-
</File>
51155079
<File
51165080
RelativePath=".\src\sysspec.cpp"
51175081
>

0 commit comments

Comments
 (0)