diff options
Diffstat (limited to 'WebCore/WebCore.xcodeproj')
| -rw-r--r-- | WebCore/WebCore.xcodeproj/project.pbxproj | 823 |
1 files changed, 571 insertions, 252 deletions
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 33d3f84..abe9e8c 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -54,6 +54,7 @@ 080FAE1B0EEEBDA800AACDE9 /* WMLTemplateElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 080FAE190EEEBDA800AACDE9 /* WMLTemplateElement.h */; }; 0818AEE20EDB86BC00647B66 /* WMLEventHandlingElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0818AEE00EDB86BC00647B66 /* WMLEventHandlingElement.cpp */; }; 0818AEE30EDB86BC00647B66 /* WMLEventHandlingElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0818AEE10EDB86BC00647B66 /* WMLEventHandlingElement.h */; }; + 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 081AA8D91111237E002AB06E /* SVGElementRareData.h */; }; 081D81310EE0E74D00D73689 /* WMLTimerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */; }; 081D81320EE0E74D00D73689 /* WMLTimerElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 081D81300EE0E74D00D73689 /* WMLTimerElement.h */; }; 081EBF3A0FD34F4100DA7559 /* SVGFilterBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */; }; @@ -62,6 +63,8 @@ 08203AA00ED8C35300B8B61A /* WMLAccessElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */; }; 082341C50FCF3A9500D75BD6 /* WMLSelectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082341C30FCF3A9400D75BD6 /* WMLSelectElement.cpp */; }; 082341C60FCF3A9500D75BD6 /* WMLSelectElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 082341C40FCF3A9400D75BD6 /* WMLSelectElement.h */; }; + 082FCAC4110927CE00CC4821 /* JSSVGContextCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 082FCAC3110927CE00CC4821 /* JSSVGContextCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 08385FF610F0186000BFE07B /* SVGMarkerData.h in Headers */ = {isa = PBXBuildFile; fileRef = 08385FF510F0186000BFE07B /* SVGMarkerData.h */; }; 0839476C0ECE4BD600027350 /* WMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08FB84B00ECE373300DC064E /* WMLElementFactory.cpp */; }; 0839476D0ECE4BD600027350 /* WMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 08FB84B10ECE373300DC064E /* WMLElementFactory.h */; }; 083DAEA60F01A7FB00342754 /* RenderTextControlMultiLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 083DAEA20F01A7FB00342754 /* RenderTextControlMultiLine.cpp */; }; @@ -74,6 +77,8 @@ 084CE5CC0F27DADC00E6240E /* WMLOptGroupElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 084CE5C80F27DADC00E6240E /* WMLOptGroupElement.h */; }; 084CE5CD0F27DADC00E6240E /* WMLOptionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 084CE5C90F27DADC00E6240E /* WMLOptionElement.cpp */; }; 084CE5CE0F27DADC00E6240E /* WMLOptionElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 084CE5CA0F27DADC00E6240E /* WMLOptionElement.h */; }; + 084D2833110A7FCB0038239A /* SVGAnimatedPropertySynchronizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 084D2831110A7FCB0038239A /* SVGAnimatedPropertySynchronizer.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 084D2834110A7FCB0038239A /* SVGAnimatedPropertyTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 084D2832110A7FCB0038239A /* SVGAnimatedPropertyTraits.h */; settings = {ATTRIBUTES = (Private, ); }; }; 084DBAA10ED39D360038C226 /* WMLVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 084DBA9D0ED39D350038C226 /* WMLVariables.cpp */; }; 084DBAA20ED39D360038C226 /* WMLVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 084DBA9E0ED39D360038C226 /* WMLVariables.h */; }; 08591AA50F085C4E009BACB1 /* InputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08591AA40F085C4E009BACB1 /* InputElement.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -88,12 +93,12 @@ 087281560F26B9B600AFC596 /* OptionElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 087281520F26B9B600AFC596 /* OptionElement.h */; }; 087281570F26B9B600AFC596 /* OptionGroupElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087281530F26B9B600AFC596 /* OptionGroupElement.cpp */; }; 087281580F26B9B600AFC596 /* OptionGroupElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 087281540F26B9B600AFC596 /* OptionGroupElement.h */; }; + 08735FB810E91232006D6FAD /* SVGMarkerLayoutInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08735FB610E91232006D6FAD /* SVGMarkerLayoutInfo.cpp */; }; + 08735FB910E91232006D6FAD /* SVGMarkerLayoutInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 08735FB710E91232006D6FAD /* SVGMarkerLayoutInfo.h */; }; 08744BAA0EDB7D86004C9E63 /* WMLOnEventElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08744BA90EDB7D86004C9E63 /* WMLOnEventElement.cpp */; }; 08744BAE0EDB7D92004C9E63 /* WMLOnEventElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08744BAD0EDB7D92004C9E63 /* WMLOnEventElement.h */; }; 0878B1FD10874E3F00A55097 /* SVGAnimatedProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 0878B1F910874E3F00A55097 /* SVGAnimatedProperty.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 0878B1FE10874E3F00A55097 /* SynchronizablePropertyController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0878B1FA10874E3F00A55097 /* SynchronizablePropertyController.cpp */; }; - 0878B1FF10874E3F00A55097 /* SynchronizablePropertyController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0878B1FB10874E3F00A55097 /* SynchronizablePropertyController.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 0878B20010874E3F00A55097 /* SynchronizableTypeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 0878B1FC10874E3F00A55097 /* SynchronizableTypeWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 087D97BF10FB8D7700C00874 /* JSSVGPODListCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 087D97BE10FB8D7700C00874 /* JSSVGPODListCustom.h */; }; 087FFA0F0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087FFA0D0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp */; }; 087FFA100EFF3ED3009DBD88 /* WMLInsertedLegendElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 087FFA0E0EFF3ED3009DBD88 /* WMLInsertedLegendElement.h */; }; 08807B760ED709AB003F6975 /* WMLGoElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08807B6A0ED709AB003F6975 /* WMLGoElement.cpp */; }; @@ -135,10 +140,15 @@ 08C4C5190EF19A4000E4840F /* WMLImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C4C5150EF19A4000E4840F /* WMLImageElement.h */; }; 08C4C51A0EF19A4000E4840F /* WMLImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C4C5160EF19A4000E4840F /* WMLImageLoader.cpp */; }; 08C4C51B0EF19A4000E4840F /* WMLImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C4C5170EF19A4000E4840F /* WMLImageLoader.h */; }; + 08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; }; 08C925190FCC7C4A00480DEC /* FilterEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */; }; 08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C925180FCC7C4A00480DEC /* FilterEffect.h */; }; 08CD61BC0ED3929C002DDF51 /* WMLTaskElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61B80ED3929C002DDF51 /* WMLTaskElement.cpp */; }; 08CD61BD0ED3929C002DDF51 /* WMLTaskElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08CD61B90ED3929C002DDF51 /* WMLTaskElement.h */; }; + 08DAB9BA1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08DAB9B81103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp */; }; + 08DAB9BB1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 08DAB9B91103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h */; }; + 08DAB9C21103D9C1003E7ABA /* SVGShadowTreeElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08DAB9C01103D9C1003E7ABA /* SVGShadowTreeElements.cpp */; }; + 08DAB9C31103D9C1003E7ABA /* SVGShadowTreeElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 08DAB9C11103D9C1003E7ABA /* SVGShadowTreeElements.h */; }; 08E192530EDE0C3A0087B780 /* WMLErrorHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08E192510EDE0C390087B780 /* WMLErrorHandling.cpp */; }; 08E192540EDE0C3A0087B780 /* WMLErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 08E192520EDE0C3A0087B780 /* WMLErrorHandling.h */; }; 08E4FE460E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */; }; @@ -147,6 +157,8 @@ 08E6E0F10EFF42BA00029FBF /* WMLFieldSetElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08E6E0EF0EFF42BA00029FBF /* WMLFieldSetElement.cpp */; }; 08E6E0F20EFF42BA00029FBF /* WMLFieldSetElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08E6E0F00EFF42BA00029FBF /* WMLFieldSetElement.h */; }; 0A4844990CA44CB200B7BD48 /* SoftLinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A4844980CA44CB200B7BD48 /* SoftLinking.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 0AFDAC3B10F5448300E1F3D2 /* PluginWidgetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AFDAC3A10F5448300E1F3D2 /* PluginWidgetMac.mm */; }; + 0AFDAC3D10F5448C00E1F3D2 /* PluginWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AFDAC3C10F5448C00E1F3D2 /* PluginWidget.h */; settings = {ATTRIBUTES = (Private, ); }; }; 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B8C56D30F28627F000502E1 /* HTTPHeaderMap.cpp */; }; 0B9056190F2578BE0095FF6A /* DocumentThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B9056150F2578BE0095FF6A /* DocumentThreadableLoader.cpp */; }; 0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B9056160F2578BE0095FF6A /* DocumentThreadableLoader.h */; settings = {ATTRIBUTES = (); }; }; @@ -158,7 +170,6 @@ 0BE030A20F3112FB003C1A46 /* RenderLineBoxList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BE030A10F3112FB003C1A46 /* RenderLineBoxList.h */; settings = {ATTRIBUTES = (Private, ); }; }; 0C3F1F5A10C8871200D72CE1 /* WebGLUniformLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C3F1F5710C8871200D72CE1 /* WebGLUniformLocation.cpp */; }; 0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C3F1F5810C8871200D72CE1 /* WebGLUniformLocation.h */; }; - 0C3F1F5C10C8871200D72CE1 /* WebGLUniformLocation.idl in Resources */ = {isa = PBXBuildFile; fileRef = 0C3F1F5910C8871200D72CE1 /* WebGLUniformLocation.idl */; }; 0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C45342510CDBBFA00869157 /* JSWebGLUniformLocation.cpp */; }; 0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */; }; 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F11A54E0F39233100C37884 /* RenderSelectionInfo.h */; }; @@ -176,6 +187,8 @@ 0F580CFE0F12DE9B0051D689 /* RenderLayerCompositor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F580CFA0F12DE9B0051D689 /* RenderLayerCompositor.cpp */; }; 0F580CFF0F12DE9B0051D689 /* RenderLayerBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F580CFB0F12DE9B0051D689 /* RenderLayerBacking.h */; }; 0F580D000F12DE9B0051D689 /* RenderLayerBacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F580CFC0F12DE9B0051D689 /* RenderLayerBacking.cpp */; }; + 0F5B7A5410F65D7A00376302 /* RenderEmbeddedObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */; }; + 0F5B7A5510F65D7A00376302 /* RenderEmbeddedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */; }; 0F6ECD450F252F3700BDE271 /* CSSPropertyLonghand.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6ECD430F252F3700BDE271 /* CSSPropertyLonghand.h */; }; 0F6ECD460F252F3700BDE271 /* CSSPropertyLonghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6ECD440F252F3700BDE271 /* CSSPropertyLonghand.cpp */; }; 0FC705210EB1815600B90AD8 /* AtomicStringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC705200EB1815600B90AD8 /* AtomicStringHash.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -545,6 +558,7 @@ 1CF6BE140E9BB4670025E1CD /* ObjCNodeFilterCondition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6BE120E9BB4670025E1CD /* ObjCNodeFilterCondition.mm */; }; 1CF6BE150E9BB4670025E1CD /* ObjCNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CF6BE130E9BB4670025E1CD /* ObjCNodeFilterCondition.h */; }; 1CFAE3230A6D6A3F0032593D /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */; }; + 228C284510D82500009D0D0E /* ScriptWrappable.h in Headers */ = {isa = PBXBuildFile; fileRef = 228C284410D82500009D0D0E /* ScriptWrappable.h */; settings = {ATTRIBUTES = (Private, ); }; }; 24F54EAC101FE914000AE741 /* ApplicationCacheHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24F54EAA101FE914000AE741 /* ApplicationCacheHost.cpp */; }; 24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; }; 29A812260FBB9C1D00510293 /* AccessibilityRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */; }; @@ -582,6 +596,13 @@ 29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A812470FBB9CA900510293 /* AXObjectCacheMac.mm */; }; 2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; }; 2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 2E2D99CD10E2BBDA00496337 /* JSBlob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */; }; + 2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E2D99CC10E2BBDA00496337 /* JSBlob.h */; }; + 2E2D99E710E2BC1C00496337 /* DOMBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E2D99E510E2BC1C00496337 /* DOMBlob.h */; }; + 2E2D99E810E2BC1C00496337 /* DOMBlob.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E2D99E610E2BC1C00496337 /* DOMBlob.mm */; }; + 2E2D99EA10E2BC3800496337 /* DOMBlobInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E2D99E910E2BC3800496337 /* DOMBlobInternal.h */; }; + 2E2D99EB10E2BD3900496337 /* DOMBlob.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 2E2D99E510E2BC1C00496337 /* DOMBlob.h */; }; + 2E2D99EC10E2BD3900496337 /* DOMBlobInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 2E2D99E910E2BC3800496337 /* DOMBlobInternal.h */; }; 2E4346440F546A8200B0F1BA /* GenericWorkerTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346320F546A8200B0F1BA /* GenericWorkerTask.h */; }; 2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346330F546A8200B0F1BA /* Worker.cpp */; }; 2E4346460F546A8200B0F1BA /* Worker.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346340F546A8200B0F1BA /* Worker.h */; }; @@ -600,6 +621,8 @@ 2E4346580F546A9900B0F1BA /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */; }; 2E4346590F546A9900B0F1BA /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */; }; 2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EA768030FE7126400AB9C8A /* WorkerScriptLoaderClient.h */; }; + 2EAFAF0E10E2AF2D007ED3D6 /* Blob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EAFAF0B10E2AF2D007ED3D6 /* Blob.cpp */; }; + 2EAFAF0F10E2AF2D007ED3D6 /* Blob.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EAFAF0C10E2AF2D007ED3D6 /* Blob.h */; }; 2ECF7ADC10162B3800427DE7 /* JSErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ECF7ADA10162B3800427DE7 /* JSErrorEvent.cpp */; }; 2ECF7ADD10162B3800427DE7 /* JSErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ECF7ADB10162B3800427DE7 /* JSErrorEvent.h */; }; 2ECF7AE110162B5800427DE7 /* ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ECF7ADE10162B5800427DE7 /* ErrorEvent.cpp */; }; @@ -682,6 +705,7 @@ 37C236111097EE7700EF9F72 /* ComplexTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C2360F1097EE7700EF9F72 /* ComplexTextController.h */; }; 37C238211098C84200EF9F72 /* ComplexTextControllerATSUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37C2381F1098C84200EF9F72 /* ComplexTextControllerATSUI.cpp */; }; 37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.cpp */; }; + 37C28A6810F659CC008C7813 /* TypesettingFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C28A6710F659CC008C7813 /* TypesettingFeatures.h */; settings = {ATTRIBUTES = (Private, ); }; }; 37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; }; 37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; }; 41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; }; @@ -953,6 +977,11 @@ 510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A47103177A20049EA54 /* WebSocketChannel.cpp */; }; 510D4A4F103177A20049EA54 /* WebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A48103177A20049EA54 /* WebSocketChannel.h */; }; 510D4A50103177A20049EA54 /* WebSocketChannelClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A49103177A20049EA54 /* WebSocketChannelClient.h */; }; + 5112247210CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */; }; + 5112247410CFB8D8008099D7 /* ThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */; }; + 5112247610CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */; }; + 5112247810CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */; }; + 5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */; }; 5116D9770CF177BD00C2B84D /* DatabaseDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 5116D9750CF177BD00C2B84D /* DatabaseDetails.h */; settings = {ATTRIBUTES = (Private, ); }; }; 511F23170DC160DA004F0032 /* LocalStorageTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */; }; 511F23180DC160DA004F0032 /* LocalStorageTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23140DC160DA004F0032 /* LocalStorageTask.h */; }; @@ -1010,14 +1039,12 @@ 5160300B0CC4251200C8AC25 /* FileSystemPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */; }; 5160306C0CC4362300C8AC25 /* FileSystemCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */; }; 5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */; }; - 516BB7930CE91E6800512F79 /* JSSVGPointListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516BB7910CE91E6800512F79 /* JSSVGPointListCustom.cpp */; }; 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */; }; 51741D0F0B07259A00ED442C /* BackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 51741D0B0B07259A00ED442C /* BackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51741D100B07259A00ED442C /* BackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51741D0C0B07259A00ED442C /* BackForwardList.cpp */; }; 51741D110B07259A00ED442C /* HistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51741D0D0B07259A00ED442C /* HistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; }; 51741D120B07259A00ED442C /* HistoryItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51741D0E0B07259A00ED442C /* HistoryItem.cpp */; }; 5174E20A10A1F44F00F95E6F /* PopStateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5174E20810A1F44F00F95E6F /* PopStateEvent.h */; }; - 5174E20C10A1F49A00F95E6F /* PopStateEvent.idl in Resources */ = {isa = PBXBuildFile; fileRef = 5174E20B10A1F49A00F95E6F /* PopStateEvent.idl */; }; 5189F01810B3781300F3C739 /* JSPopStateEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F01710B3781300F3C739 /* JSPopStateEventCustom.cpp */; }; 5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */; }; 5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */; }; @@ -1099,8 +1126,11 @@ 59B597731108656B007159E8 /* BridgeJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59B597721108656B007159E8 /* BridgeJSC.cpp */; }; 59B5977511086579007159E8 /* BridgeJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59B5977411086579007159E8 /* BridgeJSC.h */; settings = {ATTRIBUTES = (Private, ); }; }; 59BC393F11054A1300FD85DB /* JavaStringJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BC393E11054A1300FD85DB /* JavaStringJSC.h */; }; +<<<<<<< HEAD 59BD83BA11199B9000E1B6A9 /* GeolocationPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BD83B911199B9000E1B6A9 /* GeolocationPositionCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; 59BD83BC11199B9C00E1B6A9 /* GeolocationPositionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59BD83BB11199B9C00E1B6A9 /* GeolocationPositionCache.cpp */; }; +======= +>>>>>>> webkit.org at r54127 59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */; }; 59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */; settings = {ATTRIBUTES = (Private, ); }; }; 59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E560A61105336600AA1258 /* JavaClassJSC.h */; }; @@ -1152,7 +1182,6 @@ 6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */ = {isa = PBXBuildFile; fileRef = 6565814809D13043000E61D7 /* CSSValueKeywords.h */; }; 656581B209D14EE6000E61D7 /* UserAgentStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581AE09D14EE6000E61D7 /* UserAgentStyleSheets.h */; }; 656581FE09D1508D000E61D7 /* SVGElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E709D1508D000E61D7 /* SVGElementFactory.h */; }; - 6565820009D1508D000E61D7 /* SVGNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; }; 6565820209D1508D000E61D7 /* XLinkNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581EB09D1508D000E61D7 /* XLinkNames.h */; }; 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; 656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.mm */; }; @@ -1219,6 +1248,12 @@ 65FEA86909833ADE00BED4AB /* Page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65FEA86809833ADE00BED4AB /* Page.cpp */; }; 6E47E66010B7944B00B186C8 /* WebGLGetInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E47E65E10B7944B00B186C8 /* WebGLGetInfo.cpp */; }; 6E47E66110B7944B00B186C8 /* WebGLGetInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E47E65F10B7944B00B186C8 /* WebGLGetInfo.h */; }; + 6E4E91AC10F7FB3100A2779C /* CanvasContextAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E4E91A710F7FB3100A2779C /* CanvasContextAttributes.cpp */; }; + 6E4E91AD10F7FB3100A2779C /* CanvasContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4E91A810F7FB3100A2779C /* CanvasContextAttributes.h */; }; + 6E4E91AE10F7FB3100A2779C /* WebGLContextAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E4E91A910F7FB3100A2779C /* WebGLContextAttributes.cpp */; }; + 6E4E91AF10F7FB3100A2779C /* WebGLContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4E91AA10F7FB3100A2779C /* WebGLContextAttributes.h */; }; + 6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */; }; + 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */; }; 72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72626E010EF022FE00A07E20 /* FontFastPath.cpp */; }; 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; }; 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; }; @@ -1235,6 +1270,12 @@ 7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */; }; 7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD0106C2DCA007B0823 /* PluginHalter.h */; }; 7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 76CDD2F21103DA6600680521 /* AccessibilityMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76CDD2EC1103DA6600680521 /* AccessibilityMenuList.cpp */; }; + 76CDD2F31103DA6600680521 /* AccessibilityMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = 76CDD2ED1103DA6600680521 /* AccessibilityMenuList.h */; }; + 76CDD2F41103DA6600680521 /* AccessibilityMenuListPopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76CDD2EE1103DA6600680521 /* AccessibilityMenuListPopup.cpp */; }; + 76CDD2F51103DA6600680521 /* AccessibilityMenuListPopup.h in Headers */ = {isa = PBXBuildFile; fileRef = 76CDD2EF1103DA6600680521 /* AccessibilityMenuListPopup.h */; }; + 76CDD2F61103DA6600680521 /* AccessibilityMenuListOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76CDD2F01103DA6600680521 /* AccessibilityMenuListOption.cpp */; }; + 76CDD2F71103DA6600680521 /* AccessibilityMenuListOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 76CDD2F11103DA6600680521 /* AccessibilityMenuListOption.h */; }; 79AC9218109945C80021266E /* JSCompositionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79AC9216109945C80021266E /* JSCompositionEvent.cpp */; }; 79AC9219109945C80021266E /* JSCompositionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 79AC9217109945C80021266E /* JSCompositionEvent.h */; }; 79F2F5A11091939A000D87CB /* CompositionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F2F59E1091939A000D87CB /* CompositionEvent.cpp */; }; @@ -1251,13 +1292,13 @@ 7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */; }; 7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */; settings = {ATTRIBUTES = (Private, ); }; }; 7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */; }; - 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; }; + 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; }; 7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; }; 7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; }; 7A74ECBA101839A600BF939E /* InspectorBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */; }; 7A74ECBB101839A600BF939E /* InspectorBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorBackend.h */; }; 7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; }; - 7ADE722610CBBB9B006B3B3A /* ContextMenuSelectionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuSelectionHandler.h */; }; + 7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */; }; 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; }; 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; }; 84224183107E77F400766A87 /* JSSVGFEMorphologyElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84224181107E77F400766A87 /* JSSVGFEMorphologyElement.cpp */; }; @@ -2259,7 +2300,7 @@ 935C476309AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */; }; 935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */; settings = {ATTRIBUTES = (Private, ); }; }; 935C476909AC4D4300A6AAB4 /* PlatformMouseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476709AC4D4300A6AAB4 /* PlatformMouseEvent.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */; }; + 935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */; settings = {ATTRIBUTES = (Private, ); }; }; 935C476D09AC4D6300A6AAB4 /* FoundationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; 935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */; }; 935C477109AC4D7300A6AAB4 /* PlatformMouseEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */; }; @@ -2320,6 +2361,8 @@ 93C441EF0F813A1A00C1A634 /* CollectionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C441ED0F813A1A00C1A634 /* CollectionCache.cpp */; }; 93C441F00F813A1A00C1A634 /* CollectionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C441EE0F813A1A00C1A634 /* CollectionCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; 93C442000F813AE100C1A634 /* CollectionType.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C441FF0F813AE100C1A634 /* CollectionType.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 93C4F6EA1108F9A50099D0DB /* AccessibilityScrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C4F6E81108F9A50099D0DB /* AccessibilityScrollbar.cpp */; }; + 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */; }; 93C841F809CE855C00DFF5E5 /* DOMImplementationFront.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */; }; 93C841FF09CE858300DFF5E5 /* DOMImplementationFront.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */; }; 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -3331,7 +3374,7 @@ B22279730D00BF220071B782 /* SVGAElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22277DD0D00BF1F0071B782 /* SVGAElement.cpp */; }; B22279740D00BF220071B782 /* SVGAElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22277DE0D00BF1F0071B782 /* SVGAElement.h */; }; B22279760D00BF220071B782 /* SVGAngle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22277E00D00BF1F0071B782 /* SVGAngle.cpp */; }; - B22279770D00BF220071B782 /* SVGAngle.h in Headers */ = {isa = PBXBuildFile; fileRef = B22277E10D00BF1F0071B782 /* SVGAngle.h */; }; + B22279770D00BF220071B782 /* SVGAngle.h in Headers */ = {isa = PBXBuildFile; fileRef = B22277E10D00BF1F0071B782 /* SVGAngle.h */; settings = {ATTRIBUTES = (Private, ); }; }; B22279790D00BF220071B782 /* SVGAnimateColorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22277E30D00BF1F0071B782 /* SVGAnimateColorElement.cpp */; }; B222797A0D00BF220071B782 /* SVGAnimateColorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22277E40D00BF1F0071B782 /* SVGAnimateColorElement.h */; }; B22279840D00BF220071B782 /* SVGAnimatedPathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22277EE0D00BF1F0071B782 /* SVGAnimatedPathData.cpp */; }; @@ -3449,13 +3492,13 @@ B2227A320D00BF220071B782 /* SVGLength.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222789C0D00BF200071B782 /* SVGLength.cpp */; }; B2227A330D00BF220071B782 /* SVGLength.h in Headers */ = {isa = PBXBuildFile; fileRef = B222789D0D00BF200071B782 /* SVGLength.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A350D00BF220071B782 /* SVGLengthList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222789F0D00BF200071B782 /* SVGLengthList.cpp */; }; - B2227A360D00BF220071B782 /* SVGLengthList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A00D00BF200071B782 /* SVGLengthList.h */; }; + B2227A360D00BF220071B782 /* SVGLengthList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A00D00BF200071B782 /* SVGLengthList.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A380D00BF220071B782 /* SVGLinearGradientElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278A20D00BF200071B782 /* SVGLinearGradientElement.cpp */; }; B2227A390D00BF220071B782 /* SVGLinearGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A30D00BF200071B782 /* SVGLinearGradientElement.h */; }; B2227A3B0D00BF220071B782 /* SVGLineElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278A50D00BF200071B782 /* SVGLineElement.cpp */; }; B2227A3C0D00BF220071B782 /* SVGLineElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A60D00BF200071B782 /* SVGLineElement.h */; }; - B2227A3E0D00BF220071B782 /* SVGList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A80D00BF200071B782 /* SVGList.h */; }; - B2227A3F0D00BF220071B782 /* SVGListTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A90D00BF200071B782 /* SVGListTraits.h */; }; + B2227A3E0D00BF220071B782 /* SVGList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A80D00BF200071B782 /* SVGList.h */; settings = {ATTRIBUTES = (Private, ); }; }; + B2227A3F0D00BF220071B782 /* SVGListTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278A90D00BF200071B782 /* SVGListTraits.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A400D00BF220071B782 /* SVGLocatable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278AA0D00BF200071B782 /* SVGLocatable.cpp */; }; B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278AB0D00BF200071B782 /* SVGLocatable.h */; }; B2227A430D00BF220071B782 /* SVGMarkerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278AD0D00BF200071B782 /* SVGMarkerElement.cpp */; }; @@ -3467,7 +3510,7 @@ B2227A4D0D00BF220071B782 /* SVGMPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278B70D00BF200071B782 /* SVGMPathElement.cpp */; }; B2227A4E0D00BF220071B782 /* SVGMPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278B80D00BF200071B782 /* SVGMPathElement.h */; }; B2227A500D00BF220071B782 /* SVGNumberList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278BA0D00BF200071B782 /* SVGNumberList.cpp */; }; - B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278BB0D00BF200071B782 /* SVGNumberList.h */; }; + B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278BB0D00BF200071B782 /* SVGNumberList.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A530D00BF220071B782 /* SVGPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278BD0D00BF200071B782 /* SVGPaint.cpp */; }; B2227A540D00BF220071B782 /* SVGPaint.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278BE0D00BF200071B782 /* SVGPaint.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A560D00BF220071B782 /* SVGParserUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278C00D00BF200071B782 /* SVGParserUtilities.cpp */; }; @@ -3508,7 +3551,7 @@ B2227A930D00BF220071B782 /* SVGPolylineElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278FD0D00BF210071B782 /* SVGPolylineElement.cpp */; }; B2227A940D00BF220071B782 /* SVGPolylineElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278FE0D00BF210071B782 /* SVGPolylineElement.h */; }; B2227A960D00BF220071B782 /* SVGPreserveAspectRatio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279000D00BF210071B782 /* SVGPreserveAspectRatio.cpp */; }; - B2227A970D00BF220071B782 /* SVGPreserveAspectRatio.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279010D00BF210071B782 /* SVGPreserveAspectRatio.h */; }; + B2227A970D00BF220071B782 /* SVGPreserveAspectRatio.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279010D00BF210071B782 /* SVGPreserveAspectRatio.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227A990D00BF220071B782 /* SVGRadialGradientElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279030D00BF210071B782 /* SVGRadialGradientElement.cpp */; }; B2227A9A0D00BF220071B782 /* SVGRadialGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279040D00BF210071B782 /* SVGRadialGradientElement.h */; }; B2227A9D0D00BF220071B782 /* SVGRectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279070D00BF210071B782 /* SVGRectElement.cpp */; }; @@ -3551,13 +3594,13 @@ B2227AD30D00BF220071B782 /* SVGTitleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222793D0D00BF210071B782 /* SVGTitleElement.cpp */; }; B2227AD40D00BF220071B782 /* SVGTitleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222793E0D00BF210071B782 /* SVGTitleElement.h */; }; B2227AD60D00BF220071B782 /* SVGTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279400D00BF210071B782 /* SVGTransform.cpp */; }; - B2227AD70D00BF220071B782 /* SVGTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279410D00BF210071B782 /* SVGTransform.h */; }; + B2227AD70D00BF220071B782 /* SVGTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279410D00BF210071B782 /* SVGTransform.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227AD90D00BF220071B782 /* SVGTransformable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279430D00BF210071B782 /* SVGTransformable.cpp */; }; B2227ADA0D00BF220071B782 /* SVGTransformable.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279440D00BF210071B782 /* SVGTransformable.h */; }; B2227ADC0D00BF220071B782 /* SVGTransformDistance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279460D00BF210071B782 /* SVGTransformDistance.cpp */; }; B2227ADD0D00BF220071B782 /* SVGTransformDistance.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279470D00BF210071B782 /* SVGTransformDistance.h */; }; B2227ADE0D00BF220071B782 /* SVGTransformList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279480D00BF210071B782 /* SVGTransformList.cpp */; }; - B2227ADF0D00BF220071B782 /* SVGTransformList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279490D00BF210071B782 /* SVGTransformList.h */; }; + B2227ADF0D00BF220071B782 /* SVGTransformList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279490D00BF210071B782 /* SVGTransformList.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2227AE10D00BF220071B782 /* SVGTRefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222794B0D00BF210071B782 /* SVGTRefElement.cpp */; }; B2227AE20D00BF220071B782 /* SVGTRefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222794C0D00BF210071B782 /* SVGTRefElement.h */; }; B2227AE40D00BF220071B782 /* SVGTSpanElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222794E0D00BF210071B782 /* SVGTSpanElement.cpp */; }; @@ -3820,7 +3863,6 @@ B2CB92640B5BDA02009BAA78 /* DOMSVGElementInstanceList.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2CB92600B5BDA02009BAA78 /* DOMSVGElementInstanceList.mm */; }; B2CCEC470C6CA9F1006A5424 /* RenderSVGViewportContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2CCEC450C6CA9F1006A5424 /* RenderSVGViewportContainer.cpp */; }; B2CCEC480C6CA9F1006A5424 /* RenderSVGViewportContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CCEC460C6CA9F1006A5424 /* RenderSVGViewportContainer.h */; }; - B2D3FC8A0C2212CB00CF3618 /* JSSVGTransformListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3FC890C2212CB00CF3618 /* JSSVGTransformListCustom.cpp */; }; B2E27C9F0B0F2B0900F17C7B /* FloatPoint3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E27C9D0B0F2B0900F17C7B /* FloatPoint3D.cpp */; }; B2E27CA00B0F2B0900F17C7B /* FloatPoint3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B2E27C9E0B0F2B0900F17C7B /* FloatPoint3D.h */; settings = {ATTRIBUTES = (Private, ); }; }; B2E4EC970D00C22B00432643 /* SVGZoomEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2E4EC940D00C22B00432643 /* SVGZoomEvent.cpp */; }; @@ -4196,10 +4238,17 @@ BC53C60B0DA56CF10021EB5D /* GradientCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53C60A0DA56CF10021EB5D /* GradientCG.cpp */; }; BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53C6910DA591140021EB5D /* CSSGradientValue.h */; }; BC56CB2110D5AC8000A77C64 /* GeolocationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */; }; +<<<<<<< HEAD BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */; }; BC56CB2310D5AC8000A77C64 /* GeolocationControllerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.h */; }; BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */; }; BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */; }; +======= + BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */; settings = {ATTRIBUTES = (Private, ); }; }; + BC56CB2310D5AC8000A77C64 /* GeolocationControllerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; + BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */; settings = {ATTRIBUTES = (Private, ); }; }; + BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; }; +>>>>>>> webkit.org at r54127 BC5823F50C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */; }; BC5825F30C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */; }; BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */; }; @@ -4577,12 +4626,6 @@ BCFE2F120C1B58380020235F /* JSRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFE2F100C1B58370020235F /* JSRect.h */; }; BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */; settings = {ATTRIBUTES = (Private, ); }; }; BCFF64920EAD15C200C1D6F7 /* LengthSize.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFF64900EAD15C200C1D6F7 /* LengthSize.h */; settings = {ATTRIBUTES = (Private, ); }; }; - C091588A0DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C09158840DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp */; }; - C091588B0DB4209200E55AF4 /* JSInspectedObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = C09158850DB4209200E55AF4 /* JSInspectedObjectWrapper.h */; }; - C091588C0DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C09158860DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp */; }; - C091588D0DB4209200E55AF4 /* JSInspectorCallbackWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = C09158870DB4209200E55AF4 /* JSInspectorCallbackWrapper.h */; }; - C091588E0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */; }; - C091588F0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */; }; C0DFC8700DB6841A003EAE7C /* JSConsoleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */; }; C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */; }; C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */; }; @@ -4600,6 +4643,8 @@ C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = C5EBDD81105EDDEC0056816F /* StorageEventDispatcher.h */; }; C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */; }; C6D74AE409AA290A000B0A52 /* ModifySelectionListLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */; }; + CE4C00E410F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */; }; + CE4C00E610F6F7C100CA38F5 /* HTMLNoScriptElement.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */; }; CE54FD381016D9A6008B44C8 /* ScriptSourceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = CE54FD371016D9A6008B44C8 /* ScriptSourceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; }; D01A27AD10C9BFD800026A42 /* SpaceSplitString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */; }; D01A27AE10C9BFD800026A42 /* SpaceSplitString.h in Headers */ = {isa = PBXBuildFile; fileRef = D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -4657,11 +4702,14 @@ E1284BD61044A01E00EAEB52 /* DOMPageTransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = E1284BD41044A01E00EAEB52 /* DOMPageTransitionEvent.h */; }; E12EDB7B0B308A78002704B6 /* EventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = E12EDB7A0B308A78002704B6 /* EventTarget.h */; settings = {ATTRIBUTES = (Private, ); }; }; E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E12EDBE90B308E0B002704B6 /* EventTarget.cpp */; }; + E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */ = {isa = PBXBuildFile; fileRef = E15A36D61104572000B7B639 /* XMLNSNames.h */; }; + E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15A36D81104572700B7B639 /* XMLNSNames.cpp */; }; E17A4A1B0D97991D00FC10C6 /* DOMSVGAltGlyphElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 65AA6BAC0D974A00000541AE /* DOMSVGAltGlyphElement.h */; }; E17A4A1C0D97991D00FC10C6 /* DOMSVGAltGlyphElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 65AA6BAE0D974A00000541AE /* DOMSVGAltGlyphElementInternal.h */; }; E182568F0EF2B02D00933242 /* JSWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E182568D0EF2B02D00933242 /* JSWorkerContext.cpp */; }; E18256900EF2B02D00933242 /* JSWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E182568E0EF2B02D00933242 /* JSWorkerContext.h */; }; E18258AC0EF3CD7000933242 /* JSWorkerContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */; }; + E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */; }; E1A302BC0DE8370300C52F2C /* StringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A302BB0DE8370300C52F2C /* StringBuilder.h */; }; E1A302C10DE8376900C52F2C /* StringBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1A302C00DE8376900C52F2C /* StringBuilder.cpp */; }; E1A5F99B0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F99A0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp */; }; @@ -4776,11 +4824,17 @@ F5C041E50FFCA96D00839D4A /* DOMHTMLDataListElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C041E00FFCA96D00839D4A /* DOMHTMLDataListElementInternal.h */; }; F5C041E60FFCA96D00839D4A /* JSHTMLDataListElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5C041E10FFCA96D00839D4A /* JSHTMLDataListElement.cpp */; }; F5C041E70FFCA96D00839D4A /* JSHTMLDataListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C041E20FFCA96D00839D4A /* JSHTMLDataListElement.h */; }; - F5D3A57C106B83B300545297 /* ISODateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D3A57A106B83B300545297 /* ISODateTime.cpp */; }; - F5D3A57D106B83B300545297 /* ISODateTime.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D3A57B106B83B300545297 /* ISODateTime.h */; settings = {ATTRIBUTES = (Private, ); }; }; + F5D3A57C106B83B300545297 /* DateComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D3A57A106B83B300545297 /* DateComponents.cpp */; }; + F5D3A57D106B83B300545297 /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D3A57B106B83B300545297 /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; }; F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */; }; F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; }; F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; }; + FA654A641108ABB7002615E0 /* mathml.css in Resources */ = {isa = PBXBuildFile; fileRef = FA654A631108ABB7002615E0 /* mathml.css */; }; + FA654A681108ABE2002615E0 /* mathattrs.in in Resources */ = {isa = PBXBuildFile; fileRef = FA654A671108ABE2002615E0 /* mathattrs.in */; }; + FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002615E0 /* MathMLTextElement.cpp */; }; + FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002615E0 /* MathMLTextElement.h */; }; + FA654A6F1108ABFF002615E0 /* RenderMathMLBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A6D1108ABFF002615E0 /* RenderMathMLBlock.cpp */; }; + FA654A701108ABFF002615E0 /* RenderMathMLBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6E1108ABFF002615E0 /* RenderMathMLBlock.h */; }; FABE72F41059C1EB00D999DD /* MathMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */; }; FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FABE72EE1059C1EB00D999DD /* MathMLElement.h */; }; FABE72F61059C1EB00D999DD /* MathMLInlineContainerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */; }; @@ -4832,10 +4886,11 @@ dstPath = Versions/A/PrivateHeaders; dstSubfolderSpec = 1; files = ( - 1CCA732210ADD44A00FD440D /* DOMHTMLInputElementPrivate.h in Copy Generated Headers */, 5DF7F5C20F01F92A00526B4B /* CSSPropertyNames.h in Copy Generated Headers */, 8538F0300AD71CDB006A81D1 /* DOMAbstractView.h in Copy Generated Headers */, 1C11CCBC0AA6093700DADB20 /* DOMAttr.h in Copy Generated Headers */, + 2E2D99EB10E2BD3900496337 /* DOMBlob.h in Copy Generated Headers */, + 2E2D99EC10E2BD3900496337 /* DOMBlobInternal.h in Copy Generated Headers */, 1C11CCC70AA6093700DADB20 /* DOMCDATASection.h in Copy Generated Headers */, 1C11CCC50AA6093700DADB20 /* DOMCharacterData.h in Copy Generated Headers */, 1C11CCB60AA6093700DADB20 /* DOMComment.h in Copy Generated Headers */, @@ -4906,6 +4961,7 @@ 85DF812E0AA778A300486AD7 /* DOMHTMLImageElement.h in Copy Generated Headers */, 85F32B400AA6401A00FF3184 /* DOMHTMLInputElement.h in Copy Generated Headers */, 6596F2B30B8731DF001326BD /* DOMHTMLInputElementInternal.h in Copy Generated Headers */, + 1CCA732210ADD44A00FD440D /* DOMHTMLInputElementPrivate.h in Copy Generated Headers */, 8575DF820AA612D600F5DBB5 /* DOMHTMLIsIndexElement.h in Copy Generated Headers */, 85BA4CE70AA686510088052D /* DOMHTMLLabelElement.h in Copy Generated Headers */, 85BA4CE80AA686510088052D /* DOMHTMLLegendElement.h in Copy Generated Headers */, @@ -5234,6 +5290,7 @@ A8D06B390A265DCD005E7203 /* HTMLNames.h in Copy Generated Headers */, 1403BA0F09EB18F900797C7F /* JSDOMWindow.h in Copy Generated Headers */, 14DC0D3809FED073007B0235 /* JSNode.h in Copy Generated Headers */, + 08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */, ); name = "Copy Generated Headers"; runOnlyForDeploymentPostprocessing = 0; @@ -5277,6 +5334,7 @@ 080FAE190EEEBDA800AACDE9 /* WMLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLTemplateElement.h; sourceTree = "<group>"; }; 0818AEE00EDB86BC00647B66 /* WMLEventHandlingElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLEventHandlingElement.cpp; sourceTree = "<group>"; }; 0818AEE10EDB86BC00647B66 /* WMLEventHandlingElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLEventHandlingElement.h; sourceTree = "<group>"; }; + 081AA8D91111237E002AB06E /* SVGElementRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGElementRareData.h; sourceTree = "<group>"; }; 081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLTimerElement.cpp; sourceTree = "<group>"; }; 081D81300EE0E74D00D73689 /* WMLTimerElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLTimerElement.h; sourceTree = "<group>"; }; 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilterBuilder.cpp; sourceTree = "<group>"; }; @@ -5285,6 +5343,8 @@ 08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLAccessElement.h; sourceTree = "<group>"; }; 082341C30FCF3A9400D75BD6 /* WMLSelectElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLSelectElement.cpp; sourceTree = "<group>"; }; 082341C40FCF3A9400D75BD6 /* WMLSelectElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLSelectElement.h; sourceTree = "<group>"; }; + 082FCAC3110927CE00CC4821 /* JSSVGContextCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGContextCache.h; sourceTree = "<group>"; }; + 08385FF510F0186000BFE07B /* SVGMarkerData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMarkerData.h; sourceTree = "<group>"; }; 083DAEA20F01A7FB00342754 /* RenderTextControlMultiLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControlMultiLine.cpp; sourceTree = "<group>"; }; 083DAEA30F01A7FB00342754 /* RenderTextControlMultiLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTextControlMultiLine.h; sourceTree = "<group>"; }; 083DAEA40F01A7FB00342754 /* RenderTextControlSingleLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControlSingleLine.cpp; sourceTree = "<group>"; }; @@ -5295,6 +5355,8 @@ 084CE5C80F27DADC00E6240E /* WMLOptGroupElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLOptGroupElement.h; sourceTree = "<group>"; }; 084CE5C90F27DADC00E6240E /* WMLOptionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLOptionElement.cpp; sourceTree = "<group>"; }; 084CE5CA0F27DADC00E6240E /* WMLOptionElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLOptionElement.h; sourceTree = "<group>"; }; + 084D2831110A7FCB0038239A /* SVGAnimatedPropertySynchronizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertySynchronizer.h; sourceTree = "<group>"; }; + 084D2832110A7FCB0038239A /* SVGAnimatedPropertyTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyTraits.h; sourceTree = "<group>"; }; 084DBA9D0ED39D350038C226 /* WMLVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLVariables.cpp; sourceTree = "<group>"; }; 084DBA9E0ED39D360038C226 /* WMLVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLVariables.h; sourceTree = "<group>"; }; 08591AA40F085C4E009BACB1 /* InputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputElement.h; sourceTree = "<group>"; }; @@ -5309,12 +5371,12 @@ 087281520F26B9B600AFC596 /* OptionElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionElement.h; sourceTree = "<group>"; }; 087281530F26B9B600AFC596 /* OptionGroupElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionGroupElement.cpp; sourceTree = "<group>"; }; 087281540F26B9B600AFC596 /* OptionGroupElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionGroupElement.h; sourceTree = "<group>"; }; + 08735FB610E91232006D6FAD /* SVGMarkerLayoutInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGMarkerLayoutInfo.cpp; sourceTree = "<group>"; }; + 08735FB710E91232006D6FAD /* SVGMarkerLayoutInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGMarkerLayoutInfo.h; sourceTree = "<group>"; }; 08744BA90EDB7D86004C9E63 /* WMLOnEventElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLOnEventElement.cpp; sourceTree = "<group>"; }; 08744BAD0EDB7D92004C9E63 /* WMLOnEventElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLOnEventElement.h; sourceTree = "<group>"; }; 0878B1F910874E3F00A55097 /* SVGAnimatedProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedProperty.h; sourceTree = "<group>"; }; - 0878B1FA10874E3F00A55097 /* SynchronizablePropertyController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronizablePropertyController.cpp; sourceTree = "<group>"; }; - 0878B1FB10874E3F00A55097 /* SynchronizablePropertyController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronizablePropertyController.h; sourceTree = "<group>"; }; - 0878B1FC10874E3F00A55097 /* SynchronizableTypeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronizableTypeWrapper.h; sourceTree = "<group>"; }; + 087D97BE10FB8D7700C00874 /* JSSVGPODListCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGPODListCustom.h; sourceTree = "<group>"; }; 087FFA0D0EFF3ED3009DBD88 /* WMLInsertedLegendElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLInsertedLegendElement.cpp; sourceTree = "<group>"; }; 087FFA0E0EFF3ED3009DBD88 /* WMLInsertedLegendElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLInsertedLegendElement.h; sourceTree = "<group>"; }; 08807B6A0ED709AB003F6975 /* WMLGoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLGoElement.cpp; sourceTree = "<group>"; }; @@ -5348,6 +5410,10 @@ 08C925180FCC7C4A00480DEC /* FilterEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterEffect.h; path = filters/FilterEffect.h; sourceTree = "<group>"; }; 08CD61B80ED3929C002DDF51 /* WMLTaskElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLTaskElement.cpp; sourceTree = "<group>"; }; 08CD61B90ED3929C002DDF51 /* WMLTaskElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLTaskElement.h; sourceTree = "<group>"; }; + 08DAB9B81103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGShadowTreeRootContainer.cpp; sourceTree = "<group>"; }; + 08DAB9B91103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGShadowTreeRootContainer.h; sourceTree = "<group>"; }; + 08DAB9C01103D9C1003E7ABA /* SVGShadowTreeElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGShadowTreeElements.cpp; sourceTree = "<group>"; }; + 08DAB9C11103D9C1003E7ABA /* SVGShadowTreeElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGShadowTreeElements.h; sourceTree = "<group>"; }; 08E192510EDE0C390087B780 /* WMLErrorHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLErrorHandling.cpp; sourceTree = "<group>"; }; 08E192520EDE0C3A0087B780 /* WMLErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLErrorHandling.h; sourceTree = "<group>"; }; 08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGLengthCustom.cpp; sourceTree = "<group>"; }; @@ -5358,6 +5424,8 @@ 08FB84B00ECE373300DC064E /* WMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLElementFactory.cpp; sourceTree = "<group>"; }; 08FB84B10ECE373300DC064E /* WMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLElementFactory.h; sourceTree = "<group>"; }; 0A4844980CA44CB200B7BD48 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; }; + 0AFDAC3A10F5448300E1F3D2 /* PluginWidgetMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PluginWidgetMac.mm; path = mac/PluginWidgetMac.mm; sourceTree = "<group>"; }; + 0AFDAC3C10F5448C00E1F3D2 /* PluginWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginWidget.h; sourceTree = "<group>"; }; 0B8C56D30F28627F000502E1 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; }; 0B9056150F2578BE0095FF6A /* DocumentThreadableLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentThreadableLoader.cpp; sourceTree = "<group>"; }; 0B9056160F2578BE0095FF6A /* DocumentThreadableLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentThreadableLoader.h; sourceTree = "<group>"; }; @@ -5387,6 +5455,8 @@ 0F580CFA0F12DE9B0051D689 /* RenderLayerCompositor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerCompositor.cpp; sourceTree = "<group>"; }; 0F580CFB0F12DE9B0051D689 /* RenderLayerBacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayerBacking.h; sourceTree = "<group>"; }; 0F580CFC0F12DE9B0051D689 /* RenderLayerBacking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerBacking.cpp; sourceTree = "<group>"; }; + 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderEmbeddedObject.cpp; sourceTree = "<group>"; }; + 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderEmbeddedObject.h; sourceTree = "<group>"; }; 0F6ECD430F252F3700BDE271 /* CSSPropertyLonghand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSPropertyLonghand.h; sourceTree = "<group>"; }; 0F6ECD440F252F3700BDE271 /* CSSPropertyLonghand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyLonghand.cpp; sourceTree = "<group>"; }; 0F9C6F4B1073EF0400DED9BF /* WebCore.3DRendering.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = WebCore.3DRendering.exp; sourceTree = "<group>"; }; @@ -5797,6 +5867,7 @@ 1CF6BE120E9BB4670025E1CD /* ObjCNodeFilterCondition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCNodeFilterCondition.mm; sourceTree = "<group>"; }; 1CF6BE130E9BB4670025E1CD /* ObjCNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCNodeFilterCondition.h; sourceTree = "<group>"; }; 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; }; + 228C284410D82500009D0D0E /* ScriptWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptWrappable.h; sourceTree = "<group>"; }; 24F54EAA101FE914000AE741 /* ApplicationCacheHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationCacheHost.cpp; sourceTree = "<group>"; }; 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCacheHost.h; sourceTree = "<group>"; }; 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityRenderObject.cpp; sourceTree = "<group>"; }; @@ -5837,6 +5908,11 @@ 2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; }; 2D90660B0665D937006B6F1A /* ClipboardMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; + 2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlob.cpp; sourceTree = "<group>"; }; + 2E2D99CC10E2BBDA00496337 /* JSBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlob.h; sourceTree = "<group>"; }; + 2E2D99E510E2BC1C00496337 /* DOMBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMBlob.h; sourceTree = "<group>"; }; + 2E2D99E610E2BC1C00496337 /* DOMBlob.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMBlob.mm; sourceTree = "<group>"; }; + 2E2D99E910E2BC3800496337 /* DOMBlobInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMBlobInternal.h; sourceTree = "<group>"; }; 2E4346320F546A8200B0F1BA /* GenericWorkerTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GenericWorkerTask.h; path = workers/GenericWorkerTask.h; sourceTree = "<group>"; }; 2E4346330F546A8200B0F1BA /* Worker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Worker.cpp; path = workers/Worker.cpp; sourceTree = "<group>"; }; 2E4346340F546A8200B0F1BA /* Worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Worker.h; path = workers/Worker.h; sourceTree = "<group>"; }; @@ -5858,6 +5934,9 @@ 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossThreadCopier.cpp; sourceTree = "<group>"; }; 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadCopier.h; sourceTree = "<group>"; }; 2EA768030FE7126400AB9C8A /* WorkerScriptLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerScriptLoaderClient.h; path = workers/WorkerScriptLoaderClient.h; sourceTree = "<group>"; }; + 2EAFAF0B10E2AF2D007ED3D6 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Blob.cpp; sourceTree = "<group>"; }; + 2EAFAF0C10E2AF2D007ED3D6 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Blob.h; sourceTree = "<group>"; }; + 2EAFAF0D10E2AF2D007ED3D6 /* Blob.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Blob.idl; sourceTree = "<group>"; }; 2ECF7ADA10162B3800427DE7 /* JSErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorEvent.cpp; sourceTree = "<group>"; }; 2ECF7ADB10162B3800427DE7 /* JSErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorEvent.h; sourceTree = "<group>"; }; 2ECF7ADE10162B5800427DE7 /* ErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ErrorEvent.cpp; sourceTree = "<group>"; }; @@ -5949,8 +6028,10 @@ 37C2360F1097EE7700EF9F72 /* ComplexTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexTextController.h; sourceTree = "<group>"; }; 37C2381F1098C84200EF9F72 /* ComplexTextControllerATSUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextControllerATSUI.cpp; sourceTree = "<group>"; }; 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextControllerCoreText.cpp; sourceTree = "<group>"; }; + 37C28A6710F659CC008C7813 /* TypesettingFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypesettingFeatures.h; sourceTree = "<group>"; }; 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreURLResponse.h; sourceTree = "<group>"; }; 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; }; + 37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; }; 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; }; 41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; }; 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; }; @@ -6274,6 +6355,11 @@ 510D4A47103177A20049EA54 /* WebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketChannel.cpp; sourceTree = "<group>"; }; 510D4A48103177A20049EA54 /* WebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketChannel.h; sourceTree = "<group>"; }; 510D4A49103177A20049EA54 /* WebSocketChannelClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketChannelClient.h; sourceTree = "<group>"; }; + 5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadableWebSocketChannel.cpp; sourceTree = "<group>"; }; + 5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableWebSocketChannel.h; sourceTree = "<group>"; }; + 5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableWebSocketChannelClientWrapper.h; sourceTree = "<group>"; }; + 5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerThreadableWebSocketChannel.cpp; sourceTree = "<group>"; }; + 5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThreadableWebSocketChannel.h; sourceTree = "<group>"; }; 5116D9750CF177BD00C2B84D /* DatabaseDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseDetails.h; sourceTree = "<group>"; }; 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageTask.cpp; sourceTree = "<group>"; }; 511F23140DC160DA004F0032 /* LocalStorageTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageTask.h; sourceTree = "<group>"; }; @@ -6333,7 +6419,6 @@ 5160300A0CC4251200C8AC25 /* FileSystemPOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemPOSIX.cpp; sourceTree = "<group>"; }; 5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemCF.cpp; sourceTree = "<group>"; }; 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = HistoryItemMac.mm; path = mac/HistoryItemMac.mm; sourceTree = "<group>"; }; - 516BB7910CE91E6800512F79 /* JSSVGPointListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPointListCustom.cpp; sourceTree = "<group>"; }; 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTreeWalkerCustom.cpp; sourceTree = "<group>"; }; 51741D0B0B07259A00ED442C /* BackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardList.h; sourceTree = "<group>"; }; 51741D0C0B07259A00ED442C /* BackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardList.cpp; sourceTree = "<group>"; }; @@ -6434,8 +6519,11 @@ 59B597721108656B007159E8 /* BridgeJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BridgeJSC.cpp; path = bridge/jsc/BridgeJSC.cpp; sourceTree = "<group>"; }; 59B5977411086579007159E8 /* BridgeJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BridgeJSC.h; path = bridge/jsc/BridgeJSC.h; sourceTree = "<group>"; }; 59BC393E11054A1300FD85DB /* JavaStringJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaStringJSC.h; path = jsc/JavaStringJSC.h; sourceTree = "<group>"; }; +<<<<<<< HEAD 59BD83B911199B9000E1B6A9 /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; }; 59BD83BB11199B9C00E1B6A9 /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; }; +======= +>>>>>>> webkit.org at r54127 59C77F2810545B3B00506104 /* GeolocationServiceMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationServiceMock.cpp; path = mock/GeolocationServiceMock.cpp; sourceTree = "<group>"; }; 59C77F2910545B3B00506104 /* GeolocationServiceMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationServiceMock.h; path = mock/GeolocationServiceMock.h; sourceTree = "<group>"; }; 59E560A61105336600AA1258 /* JavaClassJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaClassJSC.h; path = jsc/JavaClassJSC.h; sourceTree = "<group>"; }; @@ -6565,6 +6653,13 @@ 65FEA86809833ADE00BED4AB /* Page.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Page.cpp; sourceTree = "<group>"; }; 6E47E65E10B7944B00B186C8 /* WebGLGetInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLGetInfo.cpp; path = canvas/WebGLGetInfo.cpp; sourceTree = "<group>"; }; 6E47E65F10B7944B00B186C8 /* WebGLGetInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLGetInfo.h; path = canvas/WebGLGetInfo.h; sourceTree = "<group>"; }; + 6E4E91A710F7FB3100A2779C /* CanvasContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CanvasContextAttributes.cpp; path = canvas/CanvasContextAttributes.cpp; sourceTree = "<group>"; }; + 6E4E91A810F7FB3100A2779C /* CanvasContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CanvasContextAttributes.h; path = canvas/CanvasContextAttributes.h; sourceTree = "<group>"; }; + 6E4E91A910F7FB3100A2779C /* WebGLContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLContextAttributes.cpp; path = canvas/WebGLContextAttributes.cpp; sourceTree = "<group>"; }; + 6E4E91AA10F7FB3100A2779C /* WebGLContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLContextAttributes.h; path = canvas/WebGLContextAttributes.h; sourceTree = "<group>"; }; + 6E4E91AB10F7FB3100A2779C /* WebGLContextAttributes.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLContextAttributes.idl; path = canvas/WebGLContextAttributes.idl; sourceTree = "<group>"; }; + 6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLContextAttributes.cpp; sourceTree = "<group>"; }; + 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLContextAttributes.h; sourceTree = "<group>"; }; 72626E010EF022FE00A07E20 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; }; 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; }; 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; }; @@ -6582,6 +6677,12 @@ 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginHalter.cpp; sourceTree = "<group>"; }; 7693BAD0106C2DCA007B0823 /* PluginHalter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalter.h; sourceTree = "<group>"; }; 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalterClient.h; sourceTree = "<group>"; }; + 76CDD2EC1103DA6600680521 /* AccessibilityMenuList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityMenuList.cpp; sourceTree = "<group>"; }; + 76CDD2ED1103DA6600680521 /* AccessibilityMenuList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMenuList.h; sourceTree = "<group>"; }; + 76CDD2EE1103DA6600680521 /* AccessibilityMenuListPopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityMenuListPopup.cpp; sourceTree = "<group>"; }; + 76CDD2EF1103DA6600680521 /* AccessibilityMenuListPopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMenuListPopup.h; sourceTree = "<group>"; }; + 76CDD2F01103DA6600680521 /* AccessibilityMenuListOption.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityMenuListOption.cpp; sourceTree = "<group>"; }; + 76CDD2F11103DA6600680521 /* AccessibilityMenuListOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMenuListOption.h; sourceTree = "<group>"; }; 79AC9216109945C80021266E /* JSCompositionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCompositionEvent.cpp; sourceTree = "<group>"; }; 79AC9217109945C80021266E /* JSCompositionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCompositionEvent.h; sourceTree = "<group>"; }; 79F2F59E1091939A000D87CB /* CompositionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompositionEvent.cpp; sourceTree = "<group>"; }; @@ -6608,7 +6709,7 @@ 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackend.cpp; sourceTree = "<group>"; }; 7A74ECB9101839A600BF939E /* InspectorBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackend.h; sourceTree = "<group>"; }; 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; }; - 7ADE722510CBBB9B006B3B3A /* ContextMenuSelectionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuSelectionHandler.h; sourceTree = "<group>"; }; + 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuProvider.h; sourceTree = "<group>"; }; 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; }; 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; }; 84224181107E77F400766A87 /* JSSVGFEMorphologyElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFEMorphologyElement.cpp; sourceTree = "<group>"; }; @@ -7626,6 +7727,8 @@ 93C441ED0F813A1A00C1A634 /* CollectionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollectionCache.cpp; sourceTree = "<group>"; }; 93C441EE0F813A1A00C1A634 /* CollectionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionCache.h; sourceTree = "<group>"; }; 93C441FF0F813AE100C1A634 /* CollectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionType.h; sourceTree = "<group>"; }; + 93C4F6E81108F9A50099D0DB /* AccessibilityScrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityScrollbar.cpp; sourceTree = "<group>"; }; + 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityScrollbar.h; sourceTree = "<group>"; }; 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMImplementationFront.h; sourceTree = "<group>"; }; 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMImplementationFront.cpp; sourceTree = "<group>"; }; 93CA4C9909DF93FA00DF8677 /* html.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html.css; sourceTree = "<group>"; }; @@ -8991,7 +9094,6 @@ B2CB92600B5BDA02009BAA78 /* DOMSVGElementInstanceList.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGElementInstanceList.mm; sourceTree = "<group>"; }; B2CCEC450C6CA9F1006A5424 /* RenderSVGViewportContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGViewportContainer.cpp; sourceTree = "<group>"; }; B2CCEC460C6CA9F1006A5424 /* RenderSVGViewportContainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGViewportContainer.h; sourceTree = "<group>"; }; - B2D3FC890C2212CB00CF3618 /* JSSVGTransformListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGTransformListCustom.cpp; sourceTree = "<group>"; }; B2E27C9D0B0F2B0900F17C7B /* FloatPoint3D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPoint3D.cpp; sourceTree = "<group>"; }; B2E27C9E0B0F2B0900F17C7B /* FloatPoint3D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatPoint3D.h; sourceTree = "<group>"; }; B2E4EC940D00C22B00432643 /* SVGZoomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGZoomEvent.cpp; sourceTree = "<group>"; }; @@ -9378,6 +9480,10 @@ BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationControllerClient.h; sourceTree = "<group>"; }; BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationError.h; sourceTree = "<group>"; }; BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPosition.h; sourceTree = "<group>"; }; +<<<<<<< HEAD +======= + BC56CCDF10D72BD800A77C64 /* WebCore.ClientBasedGeolocation.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = WebCore.ClientBasedGeolocation.exp; sourceTree = "<group>"; }; +>>>>>>> webkit.org at r54127 BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementCustom.cpp; sourceTree = "<group>"; }; BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleDeclarationCustom.cpp; sourceTree = "<group>"; }; BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLParserErrorCodes.h; sourceTree = "<group>"; }; @@ -9788,12 +9894,6 @@ BE91FC8B06133666005E3790 /* Position.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Position.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; BE91FC8C06133666005E3790 /* Position.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Position.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; BE983D95052A2E0A00892D85 /* WebCoreKeyboardUIMode.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyboardUIMode.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; - C09158840DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectedObjectWrapper.cpp; sourceTree = "<group>"; }; - C09158850DB4209200E55AF4 /* JSInspectedObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectedObjectWrapper.h; sourceTree = "<group>"; }; - C09158860DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorCallbackWrapper.cpp; sourceTree = "<group>"; }; - C09158870DB4209200E55AF4 /* JSInspectorCallbackWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectorCallbackWrapper.h; sourceTree = "<group>"; }; - C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSQuarantinedObjectWrapper.cpp; sourceTree = "<group>"; }; - C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQuarantinedObjectWrapper.h; sourceTree = "<group>"; }; C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSConsoleCustom.cpp; sourceTree = "<group>"; }; C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingDetectorICU.cpp; sourceTree = "<group>"; }; C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingDetector.h; sourceTree = "<group>"; }; @@ -9811,6 +9911,8 @@ C5EBDD81105EDDEC0056816F /* StorageEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageEventDispatcher.h; sourceTree = "<group>"; }; C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifySelectionListLevel.h; sourceTree = "<group>"; }; C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifySelectionListLevel.cpp; sourceTree = "<group>"; }; + CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLNoScriptElement.cpp; sourceTree = "<group>"; }; + CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLNoScriptElement.h; sourceTree = "<group>"; }; CE54FD371016D9A6008B44C8 /* ScriptSourceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptSourceProvider.h; sourceTree = "<group>"; }; D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpaceSplitString.cpp; sourceTree = "<group>"; }; D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpaceSplitString.h; sourceTree = "<group>"; }; @@ -9870,9 +9972,12 @@ E1284BD41044A01E00EAEB52 /* DOMPageTransitionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMPageTransitionEvent.h; sourceTree = "<group>"; }; E12EDB7A0B308A78002704B6 /* EventTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTarget.h; sourceTree = "<group>"; }; E12EDBE90B308E0B002704B6 /* EventTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTarget.cpp; sourceTree = "<group>"; }; + E15A36D61104572000B7B639 /* XMLNSNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLNSNames.h; sourceTree = "<group>"; }; + E15A36D81104572700B7B639 /* XMLNSNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNSNames.cpp; sourceTree = "<group>"; }; E182568D0EF2B02D00933242 /* JSWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerContext.cpp; sourceTree = "<group>"; }; E182568E0EF2B02D00933242 /* JSWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerContext.h; sourceTree = "<group>"; }; E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerContextCustom.cpp; sourceTree = "<group>"; }; + E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerNodeAlgorithms.h; sourceTree = "<group>"; }; E1A302BB0DE8370300C52F2C /* StringBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuilder.h; sourceTree = "<group>"; }; E1A302C00DE8376900C52F2C /* StringBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilder.cpp; sourceTree = "<group>"; }; E1A5F99A0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageChannelCustom.cpp; sourceTree = "<group>"; }; @@ -10029,13 +10134,19 @@ F5C2869302846DCD018635CA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; F5C2869402846DCD018635CA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; F5C2869502846DCD018635CA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - F5D3A57A106B83B300545297 /* ISODateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISODateTime.cpp; sourceTree = "<group>"; }; - F5D3A57B106B83B300545297 /* ISODateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISODateTime.h; sourceTree = "<group>"; }; + F5D3A57A106B83B300545297 /* DateComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateComponents.cpp; sourceTree = "<group>"; }; + F5D3A57B106B83B300545297 /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = "<group>"; }; F8216299029F4FB501000131 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestProgressEvent.cpp; sourceTree = "<group>"; }; F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequestProgressEvent.h; sourceTree = "<group>"; }; F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEvent.h; sourceTree = "<group>"; }; F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; }; + FA654A631108ABB7002615E0 /* mathml.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = mathml.css; sourceTree = "<group>"; }; + FA654A671108ABE2002615E0 /* mathattrs.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mathattrs.in; sourceTree = "<group>"; }; + FA654A691108ABED002615E0 /* MathMLTextElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLTextElement.cpp; sourceTree = "<group>"; }; + FA654A6A1108ABED002615E0 /* MathMLTextElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLTextElement.h; sourceTree = "<group>"; }; + FA654A6D1108ABFF002615E0 /* RenderMathMLBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMathMLBlock.cpp; sourceTree = "<group>"; }; + FA654A6E1108ABFF002615E0 /* RenderMathMLBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLBlock.h; sourceTree = "<group>"; }; FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLElement.cpp; sourceTree = "<group>"; }; FABE72EE1059C1EB00D999DD /* MathMLElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLElement.h; sourceTree = "<group>"; }; FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLInlineContainerElement.cpp; sourceTree = "<group>"; }; @@ -10210,6 +10321,14 @@ tabWidth = 4; usesTabs = 0; }; + 0AFDAC3610F5447400E1F3D2 /* mac */ = { + isa = PBXGroup; + children = ( + 0AFDAC3A10F5448300E1F3D2 /* PluginWidgetMac.mm */, + ); + name = mac; + sourceTree = "<group>"; + }; 14DFB33F0A7DF7630018F769 /* Derived Sources */ = { isa = PBXGroup; children = ( @@ -10261,8 +10380,10 @@ 1A569CC50D7E2B82007C3983 /* c */, 1A569CCE0D7E2B82007C3983 /* jni */, 1A569CE20D7E2B82007C3983 /* objc */, + 599E758F11055A1F00D904FA /* Bridge.h */, 1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */, 1A71D57A0F33819000F9CE4E /* IdentifierRep.h */, + 59B5977111086556007159E8 /* jsc */, 1A569CDA0D7E2B82007C3983 /* NP_jsobject.cpp */, 1A569CDB0D7E2B82007C3983 /* NP_jsobject.h */, 1A569CDC0D7E2B82007C3983 /* npapi.h */, @@ -10302,6 +10423,7 @@ 1A569CCE0D7E2B82007C3983 /* jni */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD 5913953C1107584E0083EC55 /* JNIBridge.cpp */, 5913953A110758450083EC55 /* JNIBridge.h */, 59EE12311106082900885116 /* JNIUtility.h */, @@ -10310,6 +10432,16 @@ 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */, 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */, 1A569CD50D7E2B82007C3983 /* jni_objc.mm */, +======= + 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */, + 1A569CD30D7E2B82007C3983 /* jni_jsobject.mm */, + 1A569CD50D7E2B82007C3983 /* jni_objc.mm */, + 5913953C1107584E0083EC55 /* JNIBridge.cpp */, + 5913953A110758450083EC55 /* JNIBridge.h */, + 59EE122F1106081F00885116 /* JNIUtility.cpp */, + 59EE12311106082900885116 /* JNIUtility.h */, + 599D1E2F10C97D4C00E0EF12 /* jsc */, +>>>>>>> webkit.org at r54127 ); name = jni; path = bridge/jni; @@ -10510,8 +10642,8 @@ 1C81B9FC0E9733CB00266E07 /* JavaScriptProfileNode.cpp */, 1C81B9FB0E9733CB00266E07 /* JavaScriptProfileNode.h */, BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */, - 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */, 7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */, + 7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */, ); path = inspector; sourceTree = "<group>"; @@ -10552,10 +10684,18 @@ 29A812240FBB9C1D00510293 /* AccessibilityListBoxOption.h */, 07B0113C1032241900FBDC33 /* AccessibilityMediaControls.cpp */, 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */, + 76CDD2EC1103DA6600680521 /* AccessibilityMenuList.cpp */, + 76CDD2ED1103DA6600680521 /* AccessibilityMenuList.h */, + 76CDD2F01103DA6600680521 /* AccessibilityMenuListOption.cpp */, + 76CDD2F11103DA6600680521 /* AccessibilityMenuListOption.h */, + 76CDD2EE1103DA6600680521 /* AccessibilityMenuListPopup.cpp */, + 76CDD2EF1103DA6600680521 /* AccessibilityMenuListPopup.h */, 29A8121E0FBB9C1D00510293 /* AccessibilityObject.cpp */, 29A812180FBB9C1D00510293 /* AccessibilityObject.h */, 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */, 29A8121B0FBB9C1D00510293 /* AccessibilityRenderObject.h */, + 93C4F6E81108F9A50099D0DB /* AccessibilityScrollbar.cpp */, + 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */, 0709FC4B1025DED80059CDBA /* AccessibilitySlider.cpp */, 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */, 29A812090FBB9C1D00510293 /* AccessibilityTable.cpp */, @@ -10683,6 +10823,7 @@ children = ( 0F9C6F4B1073EF0400DED9BF /* WebCore.3DRendering.exp */, F58EF58E02DFDFB7018635CA /* WebCore.base.exp */, + BC56CCDF10D72BD800A77C64 /* WebCore.ClientBasedGeolocation.exp */, FEFD102C105C41470002855E /* WebCore.ContextMenus.exp */, 4491959D0FBE17D700D9F824 /* WebCore.DashboardSupport.exp */, FEA4133F105D67AE0007236F /* WebCore.DragSupport.exp */, @@ -10705,6 +10846,27 @@ 49484FAE102CF01E00187DD3 /* canvas */ = { isa = PBXGroup; children = ( + 6E4E91A710F7FB3100A2779C /* CanvasContextAttributes.cpp */, + 6E4E91A810F7FB3100A2779C /* CanvasContextAttributes.h */, + 49484FB3102CF23C00187DD3 /* CanvasGradient.cpp */, + 49484FB4102CF23C00187DD3 /* CanvasGradient.h */, + 49484FB5102CF23C00187DD3 /* CanvasGradient.idl */, + 49C7B9B41042D32F0009D447 /* CanvasObject.cpp */, + 49C7B9B51042D32F0009D447 /* CanvasObject.h */, + 49484FB6102CF23C00187DD3 /* CanvasPattern.cpp */, + 49484FB7102CF23C00187DD3 /* CanvasPattern.h */, + 49484FB8102CF23C00187DD3 /* CanvasPattern.idl */, + 49484FB9102CF23C00187DD3 /* CanvasPixelArray.cpp */, + 49484FBA102CF23C00187DD3 /* CanvasPixelArray.h */, + 49484FBB102CF23C00187DD3 /* CanvasPixelArray.idl */, + 49C7B9BC1042D32F0009D447 /* CanvasRenderingContext.cpp */, + 49C7B9BD1042D32F0009D447 /* CanvasRenderingContext.h */, + 49C7B9BE1042D32F0009D447 /* CanvasRenderingContext.idl */, + 49484FBC102CF23C00187DD3 /* CanvasRenderingContext2D.cpp */, + 49484FBD102CF23C00187DD3 /* CanvasRenderingContext2D.h */, + 49484FBE102CF23C00187DD3 /* CanvasRenderingContext2D.idl */, + 49484FBF102CF23C00187DD3 /* CanvasStyle.cpp */, + 49484FC0102CF23C00187DD3 /* CanvasStyle.h */, A7D20F6B107F438B00A80392 /* WebGLActiveInfo.h */, A7D20F3B107F373800A80392 /* WebGLActiveInfo.idl */, 49EECDC710503C2300099FAB /* WebGLArray.cpp */, @@ -10719,6 +10881,9 @@ 49C7B9AB1042D32E0009D447 /* WebGLByteArray.cpp */, 49C7B9AC1042D32E0009D447 /* WebGLByteArray.h */, 49C7B9AD1042D32E0009D447 /* WebGLByteArray.idl */, + 6E4E91A910F7FB3100A2779C /* WebGLContextAttributes.cpp */, + 6E4E91AA10F7FB3100A2779C /* WebGLContextAttributes.h */, + 6E4E91AB10F7FB3100A2779C /* WebGLContextAttributes.idl */, 49EECDCD10503C2300099FAB /* WebGLFloatArray.cpp */, 49EECDCE10503C2300099FAB /* WebGLFloatArray.h */, 49EECDCF10503C2300099FAB /* WebGLFloatArray.idl */, @@ -10727,32 +10892,15 @@ 49C7B9B01042D32E0009D447 /* WebGLFramebuffer.idl */, 6E47E65E10B7944B00B186C8 /* WebGLGetInfo.cpp */, 6E47E65F10B7944B00B186C8 /* WebGLGetInfo.h */, - 49484FB3102CF23C00187DD3 /* CanvasGradient.cpp */, - 49484FB4102CF23C00187DD3 /* CanvasGradient.h */, - 49484FB5102CF23C00187DD3 /* CanvasGradient.idl */, 49EECDD010503C2300099FAB /* WebGLIntArray.cpp */, 49EECDD110503C2300099FAB /* WebGLIntArray.h */, 49EECDD210503C2300099FAB /* WebGLIntArray.idl */, - 49C7B9B41042D32F0009D447 /* CanvasObject.cpp */, - 49C7B9B51042D32F0009D447 /* CanvasObject.h */, - 49484FB6102CF23C00187DD3 /* CanvasPattern.cpp */, - 49484FB7102CF23C00187DD3 /* CanvasPattern.h */, - 49484FB8102CF23C00187DD3 /* CanvasPattern.idl */, - 49484FB9102CF23C00187DD3 /* CanvasPixelArray.cpp */, - 49484FBA102CF23C00187DD3 /* CanvasPixelArray.h */, - 49484FBB102CF23C00187DD3 /* CanvasPixelArray.idl */, 49C7B9B61042D32F0009D447 /* WebGLProgram.cpp */, 49C7B9B71042D32F0009D447 /* WebGLProgram.h */, 49C7B9B81042D32F0009D447 /* WebGLProgram.idl */, 49C7B9B91042D32F0009D447 /* WebGLRenderbuffer.cpp */, 49C7B9BA1042D32F0009D447 /* WebGLRenderbuffer.h */, 49C7B9BB1042D32F0009D447 /* WebGLRenderbuffer.idl */, - 49C7B9BC1042D32F0009D447 /* CanvasRenderingContext.cpp */, - 49C7B9BD1042D32F0009D447 /* CanvasRenderingContext.h */, - 49C7B9BE1042D32F0009D447 /* CanvasRenderingContext.idl */, - 49484FBC102CF23C00187DD3 /* CanvasRenderingContext2D.cpp */, - 49484FBD102CF23C00187DD3 /* CanvasRenderingContext2D.h */, - 49484FBE102CF23C00187DD3 /* CanvasRenderingContext2D.idl */, 49C7B9BF1042D32F0009D447 /* WebGLRenderingContext.cpp */, 49C7B9C01042D32F0009D447 /* WebGLRenderingContext.h */, 49C7B9C11042D32F0009D447 /* WebGLRenderingContext.idl */, @@ -10762,8 +10910,6 @@ 49EECDD310503C2300099FAB /* WebGLShortArray.cpp */, 49EECDD410503C2300099FAB /* WebGLShortArray.h */, 49EECDD510503C2300099FAB /* WebGLShortArray.idl */, - 49484FBF102CF23C00187DD3 /* CanvasStyle.cpp */, - 49484FC0102CF23C00187DD3 /* CanvasStyle.h */, 49C7B9C51042D32F0009D447 /* WebGLTexture.cpp */, 49C7B9C61042D32F0009D447 /* WebGLTexture.h */, 49C7B9C71042D32F0009D447 /* WebGLTexture.idl */, @@ -10989,6 +11135,9 @@ 518A34BD1026C831001B6896 /* websockets */ = { isa = PBXGroup; children = ( + 5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */, + 5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */, + 5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */, 518A34BE1026C831001B6896 /* WebSocket.cpp */, 518A34BF1026C831001B6896 /* WebSocket.h */, 518A34C01026C831001B6896 /* WebSocket.idl */, @@ -10997,6 +11146,8 @@ 510D4A49103177A20049EA54 /* WebSocketChannelClient.h */, 51ABAE421043AB4A008C5260 /* WebSocketHandshake.cpp */, 51ABAE431043AB4A008C5260 /* WebSocketHandshake.h */, + 5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */, + 5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */, ); path = websockets; sourceTree = "<group>"; @@ -11004,6 +11155,7 @@ 599D1E2F10C97D4C00E0EF12 /* jsc */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD 59E842671109E5AE000305AD /* JNIBridgeJSC.cpp */, 59E842651109E5A2000305AD /* JNIBridgeJSC.h */, 59EE122D1106080F00885116 /* JNIUtilityPrivate.h */, @@ -11013,6 +11165,17 @@ 59E560A61105336600AA1258 /* JavaClassJSC.h */, 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */, 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */, +======= + 59E560A81105336F00AA1258 /* JavaClassJSC.cpp */, + 59E560A61105336600AA1258 /* JavaClassJSC.h */, + 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */, + 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */, + 59BC393E11054A1300FD85DB /* JavaStringJSC.h */, + 59E842671109E5AE000305AD /* JNIBridgeJSC.cpp */, + 59E842651109E5A2000305AD /* JNIBridgeJSC.h */, + 59EE122B1106080500885116 /* JNIUtilityPrivate.cpp */, + 59EE122D1106080F00885116 /* JNIUtilityPrivate.h */, +>>>>>>> webkit.org at r54127 ); name = jsc; sourceTree = "<group>"; @@ -11020,8 +11183,13 @@ 59B5977111086556007159E8 /* jsc */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD 59B5977411086579007159E8 /* BridgeJSC.h */, 59B597721108656B007159E8 /* BridgeJSC.cpp */, +======= + 59B597721108656B007159E8 /* BridgeJSC.cpp */, + 59B5977411086579007159E8 /* BridgeJSC.h */, +>>>>>>> webkit.org at r54127 ); name = jsc; sourceTree = "<group>"; @@ -11047,6 +11215,7 @@ 5DCF83690D59157800953BC6 /* plugins */ = { isa = PBXGroup; children = ( + 0AFDAC3610F5447400E1F3D2 /* mac */, A9C6E4E10D745E05006442E9 /* MimeType.cpp */, A9C6E4E20D745E05006442E9 /* MimeType.h */, A9C6E65E0D7466F2006442E9 /* MimeType.idl */, @@ -11066,6 +11235,7 @@ 5DCF836C0D59159800953BC6 /* PluginInfoStore.h */, 1ADA140E0E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp */, 1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */, + 0AFDAC3C10F5448C00E1F3D2 /* PluginWidget.h */, ); path = plugins; sourceTree = "<group>"; @@ -11110,6 +11280,8 @@ 656581EB09D1508D000E61D7 /* XLinkNames.h */, A833C80A0A2CF25600D57664 /* XMLNames.cpp */, A833C80B0A2CF25600D57664 /* XMLNames.h */, + E15A36D81104572700B7B639 /* XMLNSNames.cpp */, + E15A36D61104572000B7B639 /* XMLNSNames.h */, 1A7629D30A07425100989F5B /* XPathGrammar.cpp */, 1A7629D40A07425100989F5B /* XPathGrammar.h */, ); @@ -11277,7 +11449,7 @@ 065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */, 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */, 065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */, - 7ADE722510CBBB9B006B3B3A /* ContextMenuSelectionHandler.h */, + 7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */, FE6FD4850F676E5700092873 /* Coordinates.h */, FE6FD4860F676E5700092873 /* Coordinates.idl */, BC5A86810C33676000EEA649 /* DOMSelection.cpp */, @@ -12062,6 +12234,8 @@ 85C56D030AA8BAA700D95755 /* HTML */ = { isa = PBXGroup; children = ( + 2E2D99E510E2BC1C00496337 /* DOMBlob.h */, + 2E2D99E610E2BC1C00496337 /* DOMBlob.mm */, BC00EFFE0E0A185500FD04E3 /* DOMFile.h */, BC00EFFF0E0A185500FD04E3 /* DOMFile.mm */, BC00F0010E0A185500FD04E3 /* DOMFileList.h */, @@ -12126,8 +12300,8 @@ 85DF81230AA7787200486AD7 /* DOMHTMLImageElement.h */, 85DF81240AA7787200486AD7 /* DOMHTMLImageElement.mm */, 85F32AE40AA63B8700FF3184 /* DOMHTMLInputElement.h */, - 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */, 85F32AE50AA63B8700FF3184 /* DOMHTMLInputElement.mm */, + 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */, 859A9C410AA5E3BD00B694B2 /* DOMHTMLIsIndexElement.h */, 859A9C420AA5E3BD00B694B2 /* DOMHTMLIsIndexElement.mm */, 85BA4CD90AA6861B0088052D /* DOMHTMLLabelElement.h */, @@ -12203,6 +12377,7 @@ children = ( 8538F0180AD718D8006A81D1 /* DOMAbstractViewInternal.h */, 85E7113E0AC5D5340053270F /* DOMAttrInternal.h */, + 2E2D99E910E2BC3800496337 /* DOMBlobInternal.h */, 85E7113F0AC5D5340053270F /* DOMCDATASectionInternal.h */, 85E711400AC5D5340053270F /* DOMCharacterDataInternal.h */, 85E711410AC5D5340053270F /* DOMCommentInternal.h */, @@ -12602,6 +12777,9 @@ isa = PBXGroup; children = ( 49484FAE102CF01E00187DD3 /* canvas */, + 2EAFAF0B10E2AF2D007ED3D6 /* Blob.cpp */, + 2EAFAF0C10E2AF2D007ED3D6 /* Blob.h */, + 2EAFAF0D10E2AF2D007ED3D6 /* Blob.idl */, 93C441ED0F813A1A00C1A634 /* CollectionCache.cpp */, 93C441EE0F813A1A00C1A634 /* CollectionCache.h */, 93C441FF0F813AE100C1A634 /* CollectionType.h */, @@ -12612,6 +12790,8 @@ BC77CFAB0FF173D30070887B /* DataGridColumnList.h */, BC77CF980FF172420070887B /* DataGridColumnList.idl */, BCBCAE360FF19385000762AE /* DataGridDataSource.h */, + F5D3A57A106B83B300545297 /* DateComponents.cpp */, + F5D3A57B106B83B300545297 /* DateComponents.h */, BC7DAAEC0FF9615D00CE0138 /* DOMDataGridDataSource.cpp */, BC7DAAED0FF9615D00CE0138 /* DOMDataGridDataSource.h */, BCDBB8CC0E08958400C60FF6 /* File.cpp */, @@ -12622,6 +12802,9 @@ BC1881DC0E08C54300048C13 /* FileList.idl */, A8136D370973A8E700D74463 /* FormDataList.cpp */, A8136D360973A8E700D74463 /* FormDataList.h */, + BC97E239109144950010D361 /* HTMLAllCollection.cpp */, + BC97E238109144950010D361 /* HTMLAllCollection.h */, + BC97E23C109146F10010D361 /* HTMLAllCollection.idl */, A8CFF79A0A156978000A4234 /* HTMLAnchorElement.cpp */, A8CFF7A10A156978000A4234 /* HTMLAnchorElement.h */, 1A4A2DD30A1B845100C807F8 /* HTMLAnchorElement.idl */, @@ -12659,9 +12842,6 @@ A8DF3FC9097FA0FB0052981B /* HTMLCollection.cpp */, A8DF3FC8097FA0FB0052981B /* HTMLCollection.h */, 85DF2F690AA3C74300AD64C5 /* HTMLCollection.idl */, - BC97E23C109146F10010D361 /* HTMLAllCollection.idl */, - BC97E238109144950010D361 /* HTMLAllCollection.h */, - BC97E239109144950010D361 /* HTMLAllCollection.cpp */, BC77CDB70FEFF1210070887B /* HTMLDataGridCellElement.cpp */, BC77CDBB0FEFF1420070887B /* HTMLDataGridCellElement.h */, BC77CDA20FEFEB530070887B /* HTMLDataGridCellElement.idl */, @@ -12778,6 +12958,8 @@ 1AE2AB070A1CE5CF00B42B25 /* HTMLModElement.idl */, A8DF3FCD097FA0FB0052981B /* HTMLNameCollection.cpp */, A8DF3FCC097FA0FB0052981B /* HTMLNameCollection.h */, + CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */, + CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */, A871D4510A127CBC00B12A68 /* HTMLObjectElement.cpp */, A871D4500A127CBC00B12A68 /* HTMLObjectElement.h */, 855542980AA4938800BA89F2 /* HTMLObjectElement.idl */, @@ -12865,8 +13047,6 @@ E446139A0CD6331000FADA75 /* HTMLVideoElement.idl */, BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */, BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */, - F5D3A57A106B83B300545297 /* ISODateTime.cpp */, - F5D3A57B106B83B300545297 /* ISODateTime.h */, A77979130D6B9D0C003851B9 /* ImageData.cpp */, A77979140D6B9D0C003851B9 /* ImageData.h */, A77979150D6B9D0C003851B9 /* ImageData.idl */, @@ -12893,8 +13073,6 @@ A75E8B7F0E1DE2B0007F2481 /* filters */ = { isa = PBXGroup; children = ( - 84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */, - 84801953108BAFB300CB2B1F /* FEGaussianBlur.h */, A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */, A75E8B810E1DE2D6007F2481 /* FEBlend.h */, A75E8B820E1DE2D6007F2481 /* FEColorMatrix.cpp */, @@ -12903,6 +13081,8 @@ A75E8B850E1DE2D6007F2481 /* FEComponentTransfer.h */, A75E8B860E1DE2D6007F2481 /* FEComposite.cpp */, A75E8B870E1DE2D6007F2481 /* FEComposite.h */, + 84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */, + 84801953108BAFB300CB2B1F /* FEGaussianBlur.h */, 845E72F70FD261EE00A87D79 /* Filter.h */, 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */, 08C925180FCC7C4A00480DEC /* FilterEffect.h */, @@ -12917,50 +13097,16 @@ A83B79080CCAFF2B000B0825 /* HTML */ = { isa = PBXGroup; children = ( - A7D20F60107F406900A80392 /* JSWebGLActiveInfo.cpp */, - A7D20F61107F406900A80392 /* JSWebGLActiveInfo.h */, - 49EECF19105072F300099FAB /* JSWebGLArray.cpp */, - 49EECF1A105072F300099FAB /* JSWebGLArray.h */, - 49EECEF2105070C400099FAB /* JSWebGLArrayBuffer.cpp */, - 49EECEF3105070C400099FAB /* JSWebGLArrayBuffer.h */, - 49C7B9801042D2D30009D447 /* JSWebGLBuffer.cpp */, - 49C7B9811042D2D30009D447 /* JSWebGLBuffer.h */, - 49C7B9821042D2D30009D447 /* JSWebGLByteArray.cpp */, - 49C7B9831042D2D30009D447 /* JSWebGLByteArray.h */, - 49EECEF4105070C400099FAB /* JSWebGLFloatArray.cpp */, - 49EECEF5105070C400099FAB /* JSWebGLFloatArray.h */, - 49C7B9841042D2D30009D447 /* JSWebGLFramebuffer.cpp */, - 49C7B9851042D2D30009D447 /* JSWebGLFramebuffer.h */, + 2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */, + 2E2D99CC10E2BBDA00496337 /* JSBlob.h */, 65DF323309D1DE65000BE325 /* JSCanvasGradient.cpp */, 65DF323409D1DE65000BE325 /* JSCanvasGradient.h */, - 49EECEF6105070C400099FAB /* JSWebGLIntArray.cpp */, - 49EECEF7105070C400099FAB /* JSWebGLIntArray.h */, 65DF323509D1DE65000BE325 /* JSCanvasPattern.cpp */, 65DF323609D1DE65000BE325 /* JSCanvasPattern.h */, - 49C7B9881042D2D30009D447 /* JSWebGLProgram.cpp */, - 49C7B9891042D2D30009D447 /* JSWebGLProgram.h */, - 49C7B98A1042D2D30009D447 /* JSWebGLRenderbuffer.cpp */, - 49C7B98B1042D2D30009D447 /* JSWebGLRenderbuffer.h */, 49EED13C1051969400099FAB /* JSCanvasRenderingContext.cpp */, 49EED13D1051969400099FAB /* JSCanvasRenderingContext.h */, 49EED13E1051969400099FAB /* JSCanvasRenderingContext2D.cpp */, 49EED13F1051969400099FAB /* JSCanvasRenderingContext2D.h */, - 49EED1401051969400099FAB /* JSWebGLRenderingContext.cpp */, - 49EED1411051969400099FAB /* JSWebGLRenderingContext.h */, - 49C7B98F1042D2D30009D447 /* JSWebGLShader.cpp */, - 49C7B9901042D2D30009D447 /* JSWebGLShader.h */, - 49EECEF8105070C400099FAB /* JSWebGLShortArray.cpp */, - 49EECEF9105070C400099FAB /* JSWebGLShortArray.h */, - 49C7B9911042D2D30009D447 /* JSWebGLTexture.cpp */, - 49C7B9921042D2D30009D447 /* JSWebGLTexture.h */, - 0C45342510CDBBFA00869157 /* JSWebGLUniformLocation.cpp */, - 0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */, - 49EECEFA105070C400099FAB /* JSWebGLUnsignedByteArray.cpp */, - 49EECEFB105070C400099FAB /* JSWebGLUnsignedByteArray.h */, - 49EECEFC105070C400099FAB /* JSWebGLUnsignedIntArray.cpp */, - 49EECEFD105070C400099FAB /* JSWebGLUnsignedIntArray.h */, - 49EECEFE105070C400099FAB /* JSWebGLUnsignedShortArray.cpp */, - 49EECEFF105070C400099FAB /* JSWebGLUnsignedShortArray.h */, BC77D1650FF19F550070887B /* JSDataGridColumn.cpp */, BC77D1660FF19F550070887B /* JSDataGridColumn.h */, BC77D1670FF19F550070887B /* JSDataGridColumnList.cpp */, @@ -13119,6 +13265,44 @@ E44614130CD6826900FADA75 /* JSTimeRanges.h */, 15C77092100D3CA8005BA267 /* JSValidityState.cpp */, 15C77091100D3CA8005BA267 /* JSValidityState.h */, + A7D20F60107F406900A80392 /* JSWebGLActiveInfo.cpp */, + A7D20F61107F406900A80392 /* JSWebGLActiveInfo.h */, + 49EECF19105072F300099FAB /* JSWebGLArray.cpp */, + 49EECF1A105072F300099FAB /* JSWebGLArray.h */, + 49EECEF2105070C400099FAB /* JSWebGLArrayBuffer.cpp */, + 49EECEF3105070C400099FAB /* JSWebGLArrayBuffer.h */, + 49C7B9801042D2D30009D447 /* JSWebGLBuffer.cpp */, + 49C7B9811042D2D30009D447 /* JSWebGLBuffer.h */, + 49C7B9821042D2D30009D447 /* JSWebGLByteArray.cpp */, + 49C7B9831042D2D30009D447 /* JSWebGLByteArray.h */, + 6EE8A77010F803F3005A4A24 /* JSWebGLContextAttributes.cpp */, + 6EE8A77110F803F3005A4A24 /* JSWebGLContextAttributes.h */, + 49EECEF4105070C400099FAB /* JSWebGLFloatArray.cpp */, + 49EECEF5105070C400099FAB /* JSWebGLFloatArray.h */, + 49C7B9841042D2D30009D447 /* JSWebGLFramebuffer.cpp */, + 49C7B9851042D2D30009D447 /* JSWebGLFramebuffer.h */, + 49EECEF6105070C400099FAB /* JSWebGLIntArray.cpp */, + 49EECEF7105070C400099FAB /* JSWebGLIntArray.h */, + 49C7B9881042D2D30009D447 /* JSWebGLProgram.cpp */, + 49C7B9891042D2D30009D447 /* JSWebGLProgram.h */, + 49C7B98A1042D2D30009D447 /* JSWebGLRenderbuffer.cpp */, + 49C7B98B1042D2D30009D447 /* JSWebGLRenderbuffer.h */, + 49EED1401051969400099FAB /* JSWebGLRenderingContext.cpp */, + 49EED1411051969400099FAB /* JSWebGLRenderingContext.h */, + 49C7B98F1042D2D30009D447 /* JSWebGLShader.cpp */, + 49C7B9901042D2D30009D447 /* JSWebGLShader.h */, + 49EECEF8105070C400099FAB /* JSWebGLShortArray.cpp */, + 49EECEF9105070C400099FAB /* JSWebGLShortArray.h */, + 49C7B9911042D2D30009D447 /* JSWebGLTexture.cpp */, + 49C7B9921042D2D30009D447 /* JSWebGLTexture.h */, + 0C45342510CDBBFA00869157 /* JSWebGLUniformLocation.cpp */, + 0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */, + 49EECEFA105070C400099FAB /* JSWebGLUnsignedByteArray.cpp */, + 49EECEFB105070C400099FAB /* JSWebGLUnsignedByteArray.h */, + 49EECEFC105070C400099FAB /* JSWebGLUnsignedIntArray.cpp */, + 49EECEFD105070C400099FAB /* JSWebGLUnsignedIntArray.h */, + 49EECEFE105070C400099FAB /* JSWebGLUnsignedShortArray.cpp */, + 49EECEFF105070C400099FAB /* JSWebGLUnsignedShortArray.h */, ); name = HTML; sourceTree = "<group>"; @@ -13672,6 +13856,8 @@ B22277F30D00BF1F0071B782 /* SVGAnimatedPoints.idl */, B22277F40D00BF1F0071B782 /* SVGAnimatedPreserveAspectRatio.idl */, 0878B1F910874E3F00A55097 /* SVGAnimatedProperty.h */, + 084D2831110A7FCB0038239A /* SVGAnimatedPropertySynchronizer.h */, + 084D2832110A7FCB0038239A /* SVGAnimatedPropertyTraits.h */, B22277F50D00BF1F0071B782 /* SVGAnimatedRect.idl */, B22277F60D00BF1F0071B782 /* SVGAnimatedString.idl */, B22277F70D00BF1F0071B782 /* SVGAnimatedTemplate.h */, @@ -13723,6 +13909,7 @@ B22278260D00BF1F0071B782 /* SVGElementInstanceList.cpp */, B22278270D00BF1F0071B782 /* SVGElementInstanceList.h */, B22278280D00BF1F0071B782 /* SVGElementInstanceList.idl */, + 081AA8D91111237E002AB06E /* SVGElementRareData.h */, B22278290D00BF1F0071B782 /* SVGEllipseElement.cpp */, B222782A0D00BF1F0071B782 /* SVGEllipseElement.h */, B222782B0D00BF1F0071B782 /* SVGEllipseElement.idl */, @@ -14060,9 +14247,6 @@ B2E4EC940D00C22B00432643 /* SVGZoomEvent.cpp */, B2E4EC950D00C22B00432643 /* SVGZoomEvent.h */, B2E4EC960D00C22B00432643 /* SVGZoomEvent.idl */, - 0878B1FA10874E3F00A55097 /* SynchronizablePropertyController.cpp */, - 0878B1FB10874E3F00A55097 /* SynchronizablePropertyController.h */, - 0878B1FC10874E3F00A55097 /* SynchronizableTypeWrapper.h */, B28C6A260D00C44800334AA4 /* xlinkattrs.in */, ); path = svg; @@ -14212,10 +14396,10 @@ B2A015910AF6CD53006BCE0E /* graphics */ = { isa = PBXGroup; children = ( - F4EAF4AB10C74268009100D3 /* opentype */, B27535290B053814002CE64F /* cg */, A75E8B7F0E1DE2B0007F2481 /* filters */, B27535490B053814002CE64F /* mac */, + F4EAF4AB10C74268009100D3 /* opentype */, 49E911B20EF86D27009D0CAF /* transforms */, A89943270B42338700D7C802 /* BitmapImage.cpp */, A89943260B42338700D7C802 /* BitmapImage.h */, @@ -14299,6 +14483,7 @@ B23540F10D00782E002382FA /* StringTruncator.h */, 930FC6891072B9280045293E /* TextRenderingMode.h */, A824B4640E2EF2EA0081A7B7 /* TextRun.h */, + 37C28A6710F659CC008C7813 /* TypesettingFeatures.h */, E4AFCFA40DAF29A300F5F55C /* UnitBezier.h */, 939B02EC0EA2DBC400C54570 /* WidthIterator.cpp */, 939B02ED0EA2DBC400C54570 /* WidthIterator.h */, @@ -14444,14 +14629,8 @@ BC60901D0E91B8EC000C68B5 /* JSEventTarget.h */, 3314ACE910892086000F0E56 /* JSExceptionBase.cpp */, 3314ACEA10892086000F0E56 /* JSExceptionBase.h */, - C09158840DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp */, - C09158850DB4209200E55AF4 /* JSInspectedObjectWrapper.h */, - C09158860DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp */, - C09158870DB4209200E55AF4 /* JSInspectorCallbackWrapper.h */, 93B70D4F09EB0C7C009D8468 /* JSPluginElementFunctions.cpp */, 93B70D5009EB0C7C009D8468 /* JSPluginElementFunctions.h */, - C09158880DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp */, - C09158890DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h */, 415B7C550FF598E6006770F7 /* JSSharedWorkerConstructor.cpp */, 415B7C620FF5A767006770F7 /* JSSharedWorkerConstructor.h */, 14CD8D81106B529000A46D23 /* JSSharedWorkerCustom.cpp */, @@ -14485,6 +14664,7 @@ 416F45EF0ED7B311008215B6 /* ScriptString.h */, 934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */, 934CC0E00ED39D6F00A658F2 /* ScriptValue.h */, + 228C284410D82500009D0D0E /* ScriptWrappable.h */, A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */, A75E497410752ACB00C9B896 /* SerializedScriptValue.h */, 65488D6A0DD5A83D009D83B2 /* StringSourceProvider.h */, @@ -14545,17 +14725,8 @@ children = ( 415B7C540FF598E6006770F7 /* JSAbstractWorkerCustom.cpp */, BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */, - 492273A21083B3B100EE5C84 /* JSWebGLArrayCustom.cpp */, - 49EECF7110508D9C00099FAB /* JSWebGLByteArrayCustom.cpp */, - 49EECF7210508D9C00099FAB /* JSWebGLFloatArrayCustom.cpp */, - 49EECF7310508D9C00099FAB /* JSWebGLIntArrayCustom.cpp */, 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */, - 49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */, 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */, - 49EECF7410508D9C00099FAB /* JSWebGLShortArrayCustom.cpp */, - 49EECF7510508D9C00099FAB /* JSWebGLUnsignedByteArrayCustom.cpp */, - 49EECF7610508D9C00099FAB /* JSWebGLUnsignedIntArrayCustom.cpp */, - 49EECF7710508D9C00099FAB /* JSWebGLUnsignedShortArrayCustom.cpp */, 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */, 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */, BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */, @@ -14600,6 +14771,7 @@ E0FEF371B57C53EAC1C1FBEE /* JSEventSourceCustom.cpp */, FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */, BCE7B1920D4E86960075A539 /* JSHistoryCustom.cpp */, + BC97E42B10915B060010D361 /* JSHTMLAllCollectionCustom.cpp */, BC4EDEF30C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp */, 9392262C1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp */, BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */, @@ -14640,22 +14812,30 @@ 51D0C5150DAA90B7003B3831 /* JSStorageCustom.cpp */, BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */, A84EBD770CB8C89200079609 /* JSStyleSheetListCustom.cpp */, + 082FCAC3110927CE00CC4821 /* JSSVGContextCache.h */, 08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */, 08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */, B25DFAAE0B2E2929000E6510 /* JSSVGMatrixCustom.cpp */, B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */, B297BC6F0B3C14CF0045A590 /* JSSVGPathSegListCustom.cpp */, - 516BB7910CE91E6800512F79 /* JSSVGPointListCustom.cpp */, - B2D3FC890C2212CB00CF3618 /* JSSVGTransformListCustom.cpp */, + 087D97BE10FB8D7700C00874 /* JSSVGPODListCustom.h */, 1A2C40AA0DEB55AA005AF19E /* JSTextCustom.cpp */, 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */, + 492273A21083B3B100EE5C84 /* JSWebGLArrayCustom.cpp */, + 49EECF7110508D9C00099FAB /* JSWebGLByteArrayCustom.cpp */, + 49EECF7210508D9C00099FAB /* JSWebGLFloatArrayCustom.cpp */, + 49EECF7310508D9C00099FAB /* JSWebGLIntArrayCustom.cpp */, + 49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */, + 49EECF7410508D9C00099FAB /* JSWebGLShortArrayCustom.cpp */, + 49EECF7510508D9C00099FAB /* JSWebGLUnsignedByteArrayCustom.cpp */, + 49EECF7610508D9C00099FAB /* JSWebGLUnsignedIntArrayCustom.cpp */, + 49EECF7710508D9C00099FAB /* JSWebGLUnsignedShortArrayCustom.cpp */, 518A34C61026C8C9001B6896 /* JSWebSocketCustom.cpp */, E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */, E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */, BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */, BCDFD4910E3056BD009D10AD /* JSXMLHttpRequestUploadCustom.cpp */, BCEFE1E40DCA5F3300739219 /* JSXSLTProcessorCustom.cpp */, - BC97E42B10915B060010D361 /* JSHTMLAllCollectionCustom.cpp */, ); name = Custom; sourceTree = "<group>"; @@ -14920,6 +15100,16 @@ children = ( E4EEFFC60D34550C00469A58 /* JSAudioConstructor.cpp */, E4EEFFC70D34550C00469A58 /* JSAudioConstructor.h */, + E0FEF371B77C53EAC1C1FBEE /* JSEventSourceConstructor.cpp */, + E0FEF371B67C53EAC1C1FBEE /* JSEventSourceConstructor.h */, + BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */, + BC6C49F20D7DBA0500FFA558 /* JSImageConstructor.h */, + E10743230E7835830033AF24 /* JSMessageChannelConstructor.cpp */, + E10743260E7835A50033AF24 /* JSMessageChannelConstructor.h */, + A826E8AD0A1A8F2300CD1BB6 /* JSOptionConstructor.cpp */, + A826E8AC0A1A8F2300CD1BB6 /* JSOptionConstructor.h */, + 415B7C550FF598E6006770F7 /* JSSharedWorkerConstructor.cpp */, + 415B7C620FF5A767006770F7 /* JSSharedWorkerConstructor.h */, 49EECF991050938200099FAB /* JSWebGLArrayBufferConstructor.cpp */, 49EECF9A1050938200099FAB /* JSWebGLArrayBufferConstructor.h */, 49EECF9B1050938200099FAB /* JSWebGLByteArrayConstructor.cpp */, @@ -14936,16 +15126,6 @@ 49EECFA81050938200099FAB /* JSWebGLUnsignedIntArrayConstructor.h */, 49EECFA91050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.cpp */, 49EECFAA1050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.h */, - E0FEF371B77C53EAC1C1FBEE /* JSEventSourceConstructor.cpp */, - E0FEF371B67C53EAC1C1FBEE /* JSEventSourceConstructor.h */, - BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */, - BC6C49F20D7DBA0500FFA558 /* JSImageConstructor.h */, - E10743230E7835830033AF24 /* JSMessageChannelConstructor.cpp */, - E10743260E7835A50033AF24 /* JSMessageChannelConstructor.h */, - A826E8AD0A1A8F2300CD1BB6 /* JSOptionConstructor.cpp */, - A826E8AC0A1A8F2300CD1BB6 /* JSOptionConstructor.h */, - 415B7C550FF598E6006770F7 /* JSSharedWorkerConstructor.cpp */, - 415B7C620FF5A767006770F7 /* JSSharedWorkerConstructor.h */, 498391610F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.cpp */, 498391620F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.h */, 494BD7970F55C90E00747828 /* JSWebKitPointConstructor.cpp */, @@ -15328,6 +15508,7 @@ 93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */, 93CA4C9B09DF93FA00DF8677 /* makeprop.pl */, 93CA4C9D09DF93FA00DF8677 /* makevalues.pl */, + FA654A631108ABB7002615E0 /* mathml.css */, 0FF5026E102BA9660066F39A /* Media.cpp */, 0FF5026F102BA96A0066F39A /* Media.h */, 0FF50270102BA96A0066F39A /* Media.idl */, @@ -15441,6 +15622,8 @@ 9392F1410AD185F400691BD4 /* RenderCounter.h */, BC77CEC70FF01CBE0070887B /* RenderDataGrid.cpp */, BC77CEB20FF017F20070887B /* RenderDataGrid.h */, + 0F5B7A5210F65D7A00376302 /* RenderEmbeddedObject.cpp */, + 0F5B7A5310F65D7A00376302 /* RenderEmbeddedObject.h */, A8EA73AF0A1900E300A8EF5F /* RenderFieldset.cpp */, A8EA73B00A1900E300A8EF5F /* RenderFieldset.h */, 066C772E0AB603FD00238CC4 /* RenderFileUploadControl.cpp */, @@ -15531,6 +15714,8 @@ A8F5C0B60F9285AC0098E06B /* RenderSVGModelObject.h */, AA31B5B20C1DFD1000AE7083 /* RenderSVGRoot.cpp */, AA31B5B30C1DFD1000AE7083 /* RenderSVGRoot.h */, + 08DAB9B81103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp */, + 08DAB9B91103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h */, 853CA9D20AEEC5E9002372DC /* RenderSVGText.cpp */, 853CA9D30AEEC5E9002372DC /* RenderSVGText.h */, B26554E80B80D74900A50EC3 /* RenderSVGTextPath.cpp */, @@ -15585,15 +15770,21 @@ 853CA9E30AEEC608002372DC /* SVGInlineFlowBox.h */, AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */, AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */, + 08385FF510F0186000BFE07B /* SVGMarkerData.h */, + 08735FB610E91232006D6FAD /* SVGMarkerLayoutInfo.cpp */, + 08735FB710E91232006D6FAD /* SVGMarkerLayoutInfo.h */, A8F4FB950C169E85002AFED5 /* SVGRenderSupport.cpp */, A8F4FB930C169E7B002AFED5 /* SVGRenderSupport.h */, B2EBDC9A0AF77E3400AE4A68 /* SVGRenderTreeAsText.cpp */, B2EBDC9B0AF77E3400AE4A68 /* SVGRenderTreeAsText.h */, 853CA9E40AEEC608002372DC /* SVGRootInlineBox.cpp */, 853CA9E50AEEC608002372DC /* SVGRootInlineBox.h */, + 08DAB9C01103D9C1003E7ABA /* SVGShadowTreeElements.cpp */, + 08DAB9C11103D9C1003E7ABA /* SVGShadowTreeElements.h */, A8CFF04C0A154F09000A4234 /* TableLayout.h */, AB014DE10E689A4300E10445 /* TextControlInnerElements.cpp */, AB014DE20E689A4300E10445 /* TextControlInnerElements.h */, + 37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */, 0F500AB00F54DB3100EEF928 /* TransformState.cpp */, 0F500AAE0F54DB1B00EEF928 /* TransformState.h */, ); @@ -15650,6 +15841,7 @@ 79F2F5A01091939A000D87CB /* CompositionEvent.idl */, A81872140977D3C0005826D9 /* ContainerNode.cpp */, A81872110977D3C0005826D9 /* ContainerNode.h */, + E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */, A8C4A7F809D563270003AC8D /* CSSMappedAttributeDeclaration.cpp */, A8C4A7F709D563270003AC8D /* CSSMappedAttributeDeclaration.h */, A8185F3409765765005826D9 /* Document.cpp */, @@ -15849,13 +16041,18 @@ FABE72EC1059C1EB00D999DD /* mathml */ = { isa = PBXGroup; children = ( + FA654A671108ABE2002615E0 /* mathattrs.in */, FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */, FABE72EE1059C1EB00D999DD /* MathMLElement.h */, FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */, FABE72F01059C1EB00D999DD /* MathMLInlineContainerElement.h */, FABE72F11059C1EB00D999DD /* MathMLMathElement.cpp */, FABE72F21059C1EB00D999DD /* MathMLMathElement.h */, + FA654A691108ABED002615E0 /* MathMLTextElement.cpp */, + FA654A6A1108ABED002615E0 /* MathMLTextElement.h */, FABE72F31059C1EB00D999DD /* mathtags.in */, + FA654A6D1108ABFF002615E0 /* RenderMathMLBlock.cpp */, + FA654A6E1108ABFF002615E0 /* RenderMathMLBlock.h */, ); path = mathml; sourceTree = "<group>"; @@ -15875,9 +16072,13 @@ 29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */, 29A812420FBB9C1D00510293 /* AccessibilityListBoxOption.h in Headers */, 07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */, + 76CDD2F31103DA6600680521 /* AccessibilityMenuList.h in Headers */, + 76CDD2F71103DA6600680521 /* AccessibilityMenuListOption.h in Headers */, + 76CDD2F51103DA6600680521 /* AccessibilityMenuListPopup.h in Headers */, 29A812360FBB9C1D00510293 /* AccessibilityObject.h in Headers */, 29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */, 29A812390FBB9C1D00510293 /* AccessibilityRenderObject.h in Headers */, + 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, 29A8122B0FBB9C1D00510293 /* AccessibilityTable.h in Headers */, 29A812320FBB9C1D00510293 /* AccessibilityTableCell.h in Headers */, @@ -15909,6 +16110,7 @@ A8C4A80B09D563270003AC8D /* Attribute.h in Headers */, 934F71440D5A6F5300018D69 /* AuthenticationChallenge.h in Headers */, 934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */, + E124748410AA161D00B79493 /* AuthenticationClient.h in Headers */, 514C764C0CE9234E007EF3CD /* AuthenticationMac.h in Headers */, 51E1ECB30C91C55600DC255B /* AutodrainedPool.h in Headers */, A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */, @@ -15924,11 +16126,14 @@ 938192050F87E1EC00D5352A /* BinaryPropertyList.h in Headers */, BC5EB9200E82040800B25965 /* BindingURI.h in Headers */, A89943280B42338800D7C802 /* BitmapImage.h in Headers */, + 2EAFAF0F10E2AF2D007ED3D6 /* Blob.h in Headers */, 93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */, BC5EB5E10E81BE8700B25965 /* BorderData.h in Headers */, BC5EB5DB0E81B7EA00B25965 /* BorderValue.h in Headers */, BCEA4855097D93020094C9E4 /* break_lines.h in Headers */, 93309DDB099E64920056E581 /* BreakBlockquoteCommand.h in Headers */, + 599E759011055A1F00D904FA /* Bridge.h in Headers */, + 59B5977511086579007159E8 /* BridgeJSC.h in Headers */, 1A569CF80D7E2B82007C3983 /* c_class.h in Headers */, 1A569CFA0D7E2B82007C3983 /* c_instance.h in Headers */, 1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */, @@ -15950,30 +16155,14 @@ BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */, 93F1995008245E59001E9ABC /* CachePolicy.h in Headers */, 49C7BA001042D38C0009D447 /* Canvas3DLayer.h in Headers */, - A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */, - 49EECDE010503C2400099FAB /* WebGLArray.h in Headers */, - 49EECDE310503C2400099FAB /* WebGLArrayBuffer.h in Headers */, - 49C7B9C91042D32F0009D447 /* WebGLBuffer.h in Headers */, - 49C7B9CC1042D32F0009D447 /* WebGLByteArray.h in Headers */, - 49EECDE610503C2400099FAB /* WebGLFloatArray.h in Headers */, - 49C7B9CF1042D32F0009D447 /* WebGLFramebuffer.h in Headers */, + 6E4E91AD10F7FB3100A2779C /* CanvasContextAttributes.h in Headers */, 49484FC2102CF23C00187DD3 /* CanvasGradient.h in Headers */, - 49EECDE910503C2400099FAB /* WebGLIntArray.h in Headers */, 49C7B9D51042D32F0009D447 /* CanvasObject.h in Headers */, 49484FC5102CF23C00187DD3 /* CanvasPattern.h in Headers */, 49484FC8102CF23C00187DD3 /* CanvasPixelArray.h in Headers */, - 49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */, - 49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */, 49C7B9DD1042D32F0009D447 /* CanvasRenderingContext.h in Headers */, 49484FCB102CF23C00187DD3 /* CanvasRenderingContext2D.h in Headers */, - 49C7B9E01042D32F0009D447 /* WebGLRenderingContext.h in Headers */, - 49C7B9E31042D32F0009D447 /* WebGLShader.h in Headers */, - 49EECDEC10503C2400099FAB /* WebGLShortArray.h in Headers */, 49484FCE102CF23C00187DD3 /* CanvasStyle.h in Headers */, - 49C7B9E61042D32F0009D447 /* WebGLTexture.h in Headers */, - 49EECDEF10503C2400099FAB /* WebGLUnsignedByteArray.h in Headers */, - 49EECDF210503C2400099FAB /* WebGLUnsignedIntArray.h in Headers */, - 49EECDF510503C2400099FAB /* WebGLUnsignedShortArray.h in Headers */, 6550B69E099DF0270090D781 /* CDATASection.h in Headers */, 514185EE0CD65F0400763C99 /* ChangeVersionWrapper.h in Headers */, 6550B6A0099DF0270090D781 /* CharacterData.h in Headers */, @@ -15996,7 +16185,9 @@ B27535670B053814002CE64F /* Color.h in Headers */, B22279630D00BF220071B782 /* ColorDistance.h in Headers */, EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */, + 9382DF5810A8D5C900925652 /* ColorSpace.h in Headers */, 6550B6A2099DF0270090D781 /* Comment.h in Headers */, + 37C236111097EE7700EF9F72 /* ComplexTextController.h in Headers */, 316FE1160E6E1DA700BF6088 /* CompositeAnimation.h in Headers */, 93309DDD099E64920056E581 /* CompositeEditCommand.h in Headers */, 79F2F5A21091939A000D87CB /* CompositionEvent.h in Headers */, @@ -16004,12 +16195,14 @@ BC0B36A50CD3C67C00AC7EB5 /* Console.h in Headers */, 41F0618E0F5F069800A07EAC /* ConsoleMessage.h in Headers */, A818721C0977D3C0005826D9 /* ContainerNode.h in Headers */, + E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */, BC5EB9810E82072500B25965 /* ContentData.h in Headers */, 41D015CA0F4B5C71004A662F /* ContentType.h in Headers */, 93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */, 065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */, 065AD4F70B0C2EDA005A2B1D /* ContextMenuController.h in Headers */, 06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */, + 7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */, D8B6152F1032495100C8554A /* Cookie.h in Headers */, 9352088209BD45E900F2038D /* CookieJar.h in Headers */, FE6FD4880F676E5700092873 /* Coordinates.h in Headers */, @@ -16092,6 +16285,7 @@ BC77CFAC0FF173D30070887B /* DataGridColumnList.h in Headers */, BCBCAE370FF19385000762AE /* DataGridDataSource.h in Headers */, BC22746F0E83664500E7F975 /* DataRef.h in Headers */, + F5D3A57D106B83B300545297 /* DateComponents.h in Headers */, 4162A451101145AE00DFF3ED /* DedicatedWorkerContext.h in Headers */, 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */, 4167EBF6102962BA003D252A /* DefaultSharedWorkerRepository.h in Headers */, @@ -16117,6 +16311,8 @@ 85D389B20A991A7F00282145 /* DOMAttr.h in Headers */, 85E7118D0AC5D5350053270F /* DOMAttrInternal.h in Headers */, BC946EEF107FDBAC00857193 /* DOMBeforeLoadEvent.h in Headers */, + 2E2D99E710E2BC1C00496337 /* DOMBlob.h in Headers */, + 2E2D99EA10E2BC3800496337 /* DOMBlobInternal.h in Headers */, 85089CD70A98C42800A275AA /* DOMCDATASection.h in Headers */, 85E7118E0AC5D5350053270F /* DOMCDATASectionInternal.h in Headers */, 85ACA9860A9B520300671E90 /* DOMCharacterData.h in Headers */, @@ -16880,6 +17076,7 @@ A75E8B8B0E1DE2D6007F2481 /* FEColorMatrix.h in Headers */, A75E8B8D0E1DE2D6007F2481 /* FEComponentTransfer.h in Headers */, A75E8B8F0E1DE2D6007F2481 /* FEComposite.h in Headers */, + 84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */, BCDBB8CD0E08958400C60FF6 /* File.h in Headers */, 066C772B0AB603B700238CC4 /* FileChooser.h in Headers */, BCDBB8AC0E088CA500C60FF6 /* FileList.h in Headers */, @@ -16932,6 +17129,10 @@ BCE04C8A0DAFF7A0007A0F41 /* Generator.h in Headers */, 2E4346440F546A8200B0F1BA /* GenericWorkerTask.h in Headers */, FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */, + BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */, + BC56CB2310D5AC8000A77C64 /* GeolocationControllerClient.h in Headers */, + BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */, + BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */, FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */, BCE494AB0F4F5E9E0084E319 /* GeolocationServiceMac.h in Headers */, 59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */, @@ -16957,6 +17158,7 @@ 930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */, 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */, BC3BC29C0E91AB0F00835588 /* HostWindow.h in Headers */, + BC97E23A109144950010D361 /* HTMLAllCollection.h in Headers */, A8CFF7AB0A156978000A4234 /* HTMLAnchorElement.h in Headers */, A871D45D0A127CBC00B12A68 /* HTMLAppletElement.h in Headers */, A8EA7D2E0A19385500A8EF5F /* HTMLAreaElement.h in Headers */, @@ -17013,6 +17215,7 @@ A871DC240A15205700B12A68 /* HTMLMetaElement.h in Headers */, A8CFF7A70A156978000A4234 /* HTMLModElement.h in Headers */, A8DF3FD4097FA0FC0052981B /* HTMLNameCollection.h in Headers */, + CE4C00E610F6F7C100CA38F5 /* HTMLNoScriptElement.h in Headers */, A871D45A0A127CBC00B12A68 /* HTMLObjectElement.h in Headers */, A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */, A81369DE097374F600D74463 /* HTMLOptGroupElement.h in Headers */, @@ -17047,7 +17250,6 @@ BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */, 514C76710CE923A1007EF3CD /* HTTPHeaderMap.h in Headers */, 514C76730CE923A1007EF3CD /* HTTPParsers.h in Headers */, - F5D3A57D106B83B300545297 /* ISODateTime.h in Headers */, B275356E0B053814002CE64F /* Icon.h in Headers */, 5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */, 51E1ECBE0C91C90400DC255B /* IconDatabaseClient.h in Headers */, @@ -17066,6 +17268,7 @@ 4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */, 316FE1180E6E1DA700BF6088 /* ImplicitAnimation.h in Headers */, DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */, + 7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */, A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */, A8CFF5E30A155A05000A4234 /* InlineFlowBox.h in Headers */, A8CFF5E20A155A05000A4234 /* InlineRunBox.h in Headers */, @@ -17084,60 +17287,49 @@ 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */, 41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */, 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */, + 7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */, 41F062010F5F0B6600A07EAC /* InspectorResource.h in Headers */, 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */, B27535720B053814002CE64F /* IntPoint.h in Headers */, B27535740B053814002CE64F /* IntRect.h in Headers */, B27535750B053814002CE64F /* IntSize.h in Headers */, B27535760B053814002CE64F /* IntSizeHash.h in Headers */, + 59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */, + 59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */, 1C81BA0A0E97348300266E07 /* JavaScriptCallFrame.h in Headers */, 1C81BA0C0E97348300266E07 /* JavaScriptDebugListener.h in Headers */, 1C81BA0E0E97348300266E07 /* JavaScriptDebugServer.h in Headers */, 1C81BA010E9733CB00266E07 /* JavaScriptProfile.h in Headers */, 1C81B9FF0E9733CB00266E07 /* JavaScriptProfileNode.h in Headers */, +<<<<<<< HEAD + 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */, +======= + 59BC393F11054A1300FD85DB /* JavaStringJSC.h in Headers */, 1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */, + 5913953B110758450083EC55 /* JNIBridge.h in Headers */, + 59E842661109E5A2000305AD /* JNIBridgeJSC.h in Headers */, + 59EE12321106082900885116 /* JNIUtility.h in Headers */, + 59EE122E1106080F00885116 /* JNIUtilityPrivate.h in Headers */, +>>>>>>> webkit.org at r54127 93309DF4099E64920056E581 /* JoinTextNodesCommand.h in Headers */, 418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */, 65DF31DB09D1C123000BE325 /* JSAttr.h in Headers */, E4EEFFC90D34550C00469A58 /* JSAudioConstructor.h in Headers */, BC124F000C26447A009E2349 /* JSBarInfo.h in Headers */, BC946348107A936600857193 /* JSBeforeLoadEvent.h in Headers */, + 2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */, 1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */, - A7D20F63107F406900A80392 /* JSWebGLActiveInfo.h in Headers */, - 49EECF1C105072F300099FAB /* JSWebGLArray.h in Headers */, - 49EECF01105070C400099FAB /* JSWebGLArrayBuffer.h in Headers */, - 49EECFAC1050938200099FAB /* JSWebGLArrayBufferConstructor.h in Headers */, - 49C7B9941042D2D30009D447 /* JSWebGLBuffer.h in Headers */, - 49C7B9961042D2D30009D447 /* JSWebGLByteArray.h in Headers */, - 49EECFAE1050938200099FAB /* JSWebGLByteArrayConstructor.h in Headers */, - 49EECF03105070C400099FAB /* JSWebGLFloatArray.h in Headers */, - 49EECFB01050938200099FAB /* JSWebGLFloatArrayConstructor.h in Headers */, - 49C7B9981042D2D30009D447 /* JSWebGLFramebuffer.h in Headers */, 65DF323A09D1DE65000BE325 /* JSCanvasGradient.h in Headers */, - 49EECF05105070C400099FAB /* JSWebGLIntArray.h in Headers */, - 49EECFB21050938200099FAB /* JSWebGLIntArrayConstructor.h in Headers */, 65DF323C09D1DE65000BE325 /* JSCanvasPattern.h in Headers */, - 49C7B99C1042D2D30009D447 /* JSWebGLProgram.h in Headers */, - 49C7B99E1042D2D30009D447 /* JSWebGLRenderbuffer.h in Headers */, 49EED1431051969400099FAB /* JSCanvasRenderingContext.h in Headers */, 49EED1451051969400099FAB /* JSCanvasRenderingContext2D.h in Headers */, - 49EED1471051969400099FAB /* JSWebGLRenderingContext.h in Headers */, - 49C7B9A31042D2D30009D447 /* JSWebGLShader.h in Headers */, - 49EECF07105070C400099FAB /* JSWebGLShortArray.h in Headers */, - 49EECFB61050938200099FAB /* JSWebGLShortArrayConstructor.h in Headers */, - 49C7B9A51042D2D30009D447 /* JSWebGLTexture.h in Headers */, - 49EECF09105070C400099FAB /* JSWebGLUnsignedByteArray.h in Headers */, - 49EECFB81050938200099FAB /* JSWebGLUnsignedByteArrayConstructor.h in Headers */, - 49EECF0B105070C400099FAB /* JSWebGLUnsignedIntArray.h in Headers */, - 49EECFBA1050938200099FAB /* JSWebGLUnsignedIntArrayConstructor.h in Headers */, - 49EECF0D105070C400099FAB /* JSWebGLUnsignedShortArray.h in Headers */, - 49EECFBC1050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.h in Headers */, 93F9B7A10BA6032600854064 /* JSCDATASection.h in Headers */, 65DF31F409D1CC60000BE325 /* JSCharacterData.h in Headers */, BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */, BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */, BCA83E500D7CE1E9003421A8 /* JSClipboard.h in Headers */, 93F9B6E10BA0FB7200854064 /* JSComment.h in Headers */, + 79AC9219109945C80021266E /* JSCompositionEvent.h in Headers */, BC98543E0CD3D98C00069BC1 /* JSConsole.h in Headers */, FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */, 930705DA09E0C9BF00B17FE4 /* JSCounter.h in Headers */, @@ -17164,7 +17356,6 @@ 51EC926A0CE90DD400F90308 /* JSCustomSQLTransactionErrorCallback.h in Headers */, 1A3417C90CECFF250049CBDE /* JSCustomVoidCallback.h in Headers */, E10B937C0B73C00A003ED890 /* JSCustomXPathNSResolver.h in Headers */, - 79AC9219109945C80021266E /* JSCompositionEvent.h in Headers */, 1AE82F900CAAFA9D002237AE /* JSDatabase.h in Headers */, BC77D16A0FF19F560070887B /* JSDataGridColumn.h in Headers */, BC77D16C0FF19F560070887B /* JSDataGridColumnList.h in Headers */, @@ -17193,11 +17384,13 @@ E0FEF372B37C53EAC1C1FBEE /* JSEventSource.h in Headers */, E0FEF372B67C53EAC1C1FBEE /* JSEventSourceConstructor.h in Headers */, BC60901F0E91B8EC000C68B5 /* JSEventTarget.h in Headers */, + 3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */, BC00F0150E0A189500FD04E3 /* JSFile.h in Headers */, BC00F0170E0A189500FD04E3 /* JSFileList.h in Headers */, FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */, FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */, BC94D14F0C275C68006BC617 /* JSHistory.h in Headers */, + BC97E413109154FA0010D361 /* JSHTMLAllCollection.h in Headers */, 1A4A2DF00A1B852A00C807F8 /* JSHTMLAnchorElement.h in Headers */, 1A4A2DF20A1B852A00C807F8 /* JSHTMLAppletElement.h in Headers */, 1AE2AA1F0A1CDAB400B42B25 /* JSHTMLAreaElement.h in Headers */, @@ -17271,9 +17464,9 @@ E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, BC6C49F40D7DBA0500FFA558 /* JSImageConstructor.h in Headers */, A77979290D6B9E64003851B9 /* JSImageData.h in Headers */, - C091588B0DB4209200E55AF4 /* JSInspectedObjectWrapper.h in Headers */, + 7A0E76DB10BF059800A0276E /* JSInjectedScriptHost.h in Headers */, 41F060CE0F5EEB2B00A07EAC /* JSInspectorBackend.h in Headers */, - C091588D0DB4209200E55AF4 /* JSInspectorCallbackWrapper.h in Headers */, + 7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */, 1C5FAED20DCFD90100D58F78 /* JSJavaScriptCallFrame.h in Headers */, A86629D309DA2B48009633A5 /* JSKeyboardEvent.h in Headers */, 935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */, @@ -17305,10 +17498,10 @@ A9D247FF0D757E6900FDF959 /* JSPlugin.h in Headers */, A9D248010D757E6900FDF959 /* JSPluginArray.h in Headers */, 93B70D6C09EB0C7C009D8468 /* JSPluginElementFunctions.h in Headers */, + 5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */, FE80DA720E9C472F000D6F75 /* JSPositionError.h in Headers */, 65DF320009D1CC60000BE325 /* JSProcessingInstruction.h in Headers */, E44613EE0CD681BB00FADA75 /* JSProgressEvent.h in Headers */, - C091588F0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.h in Headers */, 65DF320209D1CC60000BE325 /* JSRange.h in Headers */, D23CA55D0AB0EAAE005108A5 /* JSRangeException.h in Headers */, BCFE2F120C1B58380020235F /* JSRect.h in Headers */, @@ -17347,6 +17540,7 @@ B2FA3D5B0AB75A6F000E5AC4 /* JSSVGClipPathElement.h in Headers */, B2FA3D5D0AB75A6F000E5AC4 /* JSSVGColor.h in Headers */, B2FA3D5F0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.h in Headers */, + 082FCAC4110927CE00CC4821 /* JSSVGContextCache.h in Headers */, B2FA3D610AB75A6F000E5AC4 /* JSSVGCursorElement.h in Headers */, B2FA3D630AB75A6F000E5AC4 /* JSSVGDefsElement.h in Headers */, B2FA3D650AB75A6F000E5AC4 /* JSSVGDescElement.h in Headers */, @@ -17427,6 +17621,7 @@ B2FA3DDD0AB75A6F000E5AC4 /* JSSVGPathSegMovetoAbs.h in Headers */, B2FA3DDF0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.h in Headers */, B2FA3DE10AB75A6F000E5AC4 /* JSSVGPatternElement.h in Headers */, + 087D97BF10FB8D7700C00874 /* JSSVGPODListCustom.h in Headers */, B21127A60B3186770009BE53 /* JSSVGPODTypeWrapper.h in Headers */, 8542A7950AE5C94100DF58DF /* JSSVGPoint.h in Headers */, B2FA3DE30AB75A6F000E5AC4 /* JSSVGPointList.h in Headers */, @@ -17465,6 +17660,33 @@ 1A750D5D0A90DEE1000FF215 /* JSTreeWalker.h in Headers */, A86629CF09DA2B47009633A5 /* JSUIEvent.h in Headers */, 15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */, + A7D20F63107F406900A80392 /* JSWebGLActiveInfo.h in Headers */, + 49EECF1C105072F300099FAB /* JSWebGLArray.h in Headers */, + 49EECF01105070C400099FAB /* JSWebGLArrayBuffer.h in Headers */, + 49EECFAC1050938200099FAB /* JSWebGLArrayBufferConstructor.h in Headers */, + 49C7B9941042D2D30009D447 /* JSWebGLBuffer.h in Headers */, + 49C7B9961042D2D30009D447 /* JSWebGLByteArray.h in Headers */, + 49EECFAE1050938200099FAB /* JSWebGLByteArrayConstructor.h in Headers */, + 6EE8A77310F803F3005A4A24 /* JSWebGLContextAttributes.h in Headers */, + 49EECF03105070C400099FAB /* JSWebGLFloatArray.h in Headers */, + 49EECFB01050938200099FAB /* JSWebGLFloatArrayConstructor.h in Headers */, + 49C7B9981042D2D30009D447 /* JSWebGLFramebuffer.h in Headers */, + 49EECF05105070C400099FAB /* JSWebGLIntArray.h in Headers */, + 49EECFB21050938200099FAB /* JSWebGLIntArrayConstructor.h in Headers */, + 49C7B99C1042D2D30009D447 /* JSWebGLProgram.h in Headers */, + 49C7B99E1042D2D30009D447 /* JSWebGLRenderbuffer.h in Headers */, + 49EED1471051969400099FAB /* JSWebGLRenderingContext.h in Headers */, + 49C7B9A31042D2D30009D447 /* JSWebGLShader.h in Headers */, + 49EECF07105070C400099FAB /* JSWebGLShortArray.h in Headers */, + 49EECFB61050938200099FAB /* JSWebGLShortArrayConstructor.h in Headers */, + 49C7B9A51042D2D30009D447 /* JSWebGLTexture.h in Headers */, + 0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */, + 49EECF09105070C400099FAB /* JSWebGLUnsignedByteArray.h in Headers */, + 49EECFB81050938200099FAB /* JSWebGLUnsignedByteArrayConstructor.h in Headers */, + 49EECF0B105070C400099FAB /* JSWebGLUnsignedIntArray.h in Headers */, + 49EECFBA1050938200099FAB /* JSWebGLUnsignedIntArrayConstructor.h in Headers */, + 49EECF0D105070C400099FAB /* JSWebGLUnsignedShortArray.h in Headers */, + 49EECFBC1050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.h in Headers */, 31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */, 316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */, 316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */, @@ -17510,6 +17732,7 @@ BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */, BCFF64920EAD15C200C1D6F7 /* LengthSize.h in Headers */, B22279650D00BF220071B782 /* LinearGradientAttributes.h in Headers */, + AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */, A7AD2F880EC89D07008AB002 /* LinkHash.h in Headers */, BCB16C2D0979C3BD00467741 /* loader.h in Headers */, 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */, @@ -17527,6 +17750,7 @@ FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */, FABE72F71059C1EB00D999DD /* MathMLInlineContainerElement.h in Headers */, FABE72F91059C1EB00D999DD /* MathMLMathElement.h in Headers */, + FA654A6C1108ABED002615E0 /* MathMLTextElement.h in Headers */, 49D5DC2C0F423A73008F20FD /* Matrix3DTransformOperation.h in Headers */, 49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */, 0FF50272102BA96A0066F39A /* Media.h in Headers */, @@ -17592,6 +17816,7 @@ 1A569D190D7E2B82007C3983 /* objc_utility.h in Headers */, 1CF6BDFA0E9BB26A0025E1CD /* ObjCEventListener.h in Headers */, 1CF6BE150E9BB4670025E1CD /* ObjCNodeFilterCondition.h in Headers */, + F4EAF4AF10C742B1009100D3 /* OpenTypeSanitizer.h in Headers */, 087281560F26B9B600AFC596 /* OptionElement.h in Headers */, 087281580F26B9B600AFC596 /* OptionGroupElement.h in Headers */, 0014628B103CD1DE000B20DB /* OriginAccessEntry.h in Headers */, @@ -17633,9 +17858,11 @@ 7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */, 5DCF836D0D59159800953BC6 /* PluginInfoStore.h in Headers */, 1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */, + 0AFDAC3D10F5448C00E1F3D2 /* PluginWidget.h in Headers */, B2B1F7170D00CAA8004AEA64 /* PointerEventsHitRules.h in Headers */, 97059978107D975200A50A7C /* PolicyCallback.h in Headers */, 9705997A107D975200A50A7C /* PolicyChecker.h in Headers */, + 5174E20A10A1F44F00F95E6F /* PopStateEvent.h in Headers */, 0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */, ABC128770B33AA6D00C693D5 /* PopupMenuClient.h in Headers */, BC3BE12B0E98092F00835588 /* PopupMenuStyle.h in Headers */, @@ -17674,6 +17901,7 @@ BCEA4866097D93020094C9E4 /* RenderButton.h in Headers */, 9392F1420AD185F400691BD4 /* RenderCounter.h in Headers */, BC77CEB30FF017F20070887B /* RenderDataGrid.h in Headers */, + 0F5B7A5510F65D7A00376302 /* RenderEmbeddedObject.h in Headers */, A8EA73C40A1900E300A8EF5F /* RenderFieldset.h in Headers */, 066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */, BCEA486E097D93020094C9E4 /* RenderFlexibleBox.h in Headers */, @@ -17692,6 +17920,7 @@ A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */, A8EA7A500A191A5200A8EF5F /* RenderListMarker.h in Headers */, 0F56028F0E4B76580065B038 /* RenderMarquee.h in Headers */, + FA654A701108ABFF002615E0 /* RenderMathMLBlock.h in Headers */, E4C279590CF9741900E97B98 /* RenderMedia.h in Headers */, ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */, BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */, @@ -17702,6 +17931,10 @@ 853CA9F10AEEC657002372DC /* RenderPath.h in Headers */, A871DFE30A15376B00B12A68 /* RenderReplaced.h in Headers */, BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */, + 1479FAEE109AE37500DED655 /* RenderRuby.h in Headers */, + 1479FAF0109AE37500DED655 /* RenderRubyBase.h in Headers */, + 1479FAF2109AE37500DED655 /* RenderRubyRun.h in Headers */, + 1479FAF4109AE37500DED655 /* RenderRubyText.h in Headers */, BC3BE9940E9C1C7C00835588 /* RenderScrollbar.h in Headers */, BC3BE9950E9C1C7C00835588 /* RenderScrollbarPart.h in Headers */, BC3BE9990E9C1E5D00835588 /* RenderScrollbarTheme.h in Headers */, @@ -17718,6 +17951,7 @@ 853CA9DD0AEEC5E9002372DC /* RenderSVGInlineText.h in Headers */, A8F5C0B80F9285AC0098E06B /* RenderSVGModelObject.h in Headers */, AA31B5B50C1DFD1000AE7083 /* RenderSVGRoot.h in Headers */, + 08DAB9BB1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h in Headers */, 853CA9DF0AEEC5E9002372DC /* RenderSVGText.h in Headers */, B26554EB0B80D74900A50EC3 /* RenderSVGTextPath.h in Headers */, A8A909AC0CBCD6B50029B807 /* RenderSVGTransformableContainer.h in Headers */, @@ -17749,6 +17983,7 @@ 514C767A0CE923A1007EF3CD /* ResourceHandleClient.h in Headers */, 514C767B0CE923A1007EF3CD /* ResourceHandleInternal.h in Headers */, 656D373F0ADBA5DE00A4554D /* ResourceLoader.h in Headers */, + 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */, 514C76520CE9234E007EF3CD /* ResourceRequest.h in Headers */, 514C767D0CE923A1007EF3CD /* ResourceRequestBase.h in Headers */, 514C76540CE9234E007EF3CD /* ResourceResponse.h in Headers */, @@ -17782,6 +18017,7 @@ 41C760B10EDE03D300C1655F /* ScriptState.h in Headers */, 416F45F00ED7B311008215B6 /* ScriptString.h in Headers */, 934CC0E20ED39D6F00A658F2 /* ScriptValue.h in Headers */, + 228C284510D82500009D0D0E /* ScriptWrappable.h in Headers */, 93F199B808245E59001E9ABC /* Scrollbar.h in Headers */, BC9BC64E0E7C4889008B9849 /* ScrollbarClient.h in Headers */, BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */, @@ -17897,6 +18133,8 @@ B22279850D00BF220071B782 /* SVGAnimatedPathData.h in Headers */, B22279880D00BF220071B782 /* SVGAnimatedPoints.h in Headers */, 0878B1FD10874E3F00A55097 /* SVGAnimatedProperty.h in Headers */, + 084D2833110A7FCB0038239A /* SVGAnimatedPropertySynchronizer.h in Headers */, + 084D2834110A7FCB0038239A /* SVGAnimatedPropertyTraits.h in Headers */, B222798D0D00BF220071B782 /* SVGAnimatedTemplate.h in Headers */, B22279900D00BF220071B782 /* SVGAnimateElement.h in Headers */, B22279930D00BF220071B782 /* SVGAnimateMotionElement.h in Headers */, @@ -17917,6 +18155,7 @@ 656581FE09D1508D000E61D7 /* SVGElementFactory.h in Headers */, B22279BA0D00BF220071B782 /* SVGElementInstance.h in Headers */, B22279BD0D00BF220071B782 /* SVGElementInstanceList.h in Headers */, + 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */, B22279C00D00BF220071B782 /* SVGEllipseElement.h in Headers */, B22279C20D00BF220071B782 /* SVGException.h in Headers */, B22279C50D00BF220071B782 /* SVGExternalResourcesRequired.h in Headers */, @@ -17987,12 +18226,13 @@ B2227A3E0D00BF220071B782 /* SVGList.h in Headers */, B2227A3F0D00BF220071B782 /* SVGListTraits.h in Headers */, B2227A410D00BF220071B782 /* SVGLocatable.h in Headers */, + 08385FF610F0186000BFE07B /* SVGMarkerData.h in Headers */, B2227A440D00BF220071B782 /* SVGMarkerElement.h in Headers */, + 08735FB910E91232006D6FAD /* SVGMarkerLayoutInfo.h in Headers */, B2227A470D00BF220071B782 /* SVGMaskElement.h in Headers */, B2227A4B0D00BF220071B782 /* SVGMetadataElement.h in Headers */, B2A1F2B10CEF0ABF00442F6A /* SVGMissingGlyphElement.h in Headers */, B2227A4E0D00BF220071B782 /* SVGMPathElement.h in Headers */, - 6565820009D1508D000E61D7 /* SVGNames.h in Headers */, B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */, B2227A540D00BF220071B782 /* SVGPaint.h in Headers */, B25599A70D00D8BA00BB825C /* SVGPaintServer.h in Headers */, @@ -18038,6 +18278,7 @@ 853CA9E90AEEC608002372DC /* SVGRootInlineBox.h in Headers */, B2227AA30D00BF220071B782 /* SVGScriptElement.h in Headers */, B2227AA60D00BF220071B782 /* SVGSetElement.h in Headers */, + 08DAB9C31103D9C1003E7ABA /* SVGShadowTreeElements.h in Headers */, E4AFD0100DAF335500F5F55C /* SVGSMILElement.h in Headers */, B25599960D00D8BA00BB825C /* SVGSpotLightSource.h in Headers */, B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */, @@ -18069,8 +18310,6 @@ B2227AF30D00BF220071B782 /* SVGViewSpec.h in Headers */, B2227AF60D00BF220071B782 /* SVGZoomAndPan.h in Headers */, B2E4EC980D00C22B00432643 /* SVGZoomEvent.h in Headers */, - 0878B1FF10874E3F00A55097 /* SynchronizablePropertyController.h in Headers */, - 0878B20010874E3F00A55097 /* SynchronizableTypeWrapper.h in Headers */, 93E62D9B0985F41600E1B5E3 /* SystemTime.h in Headers */, A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */, BCE3BEC30D222B1D007E06E4 /* TagNodeList.h in Headers */, @@ -18104,9 +18343,12 @@ BCE659A90EA927B9007E4533 /* ThemeTypes.h in Headers */, 0B90561B0F2578BF0095FF6A /* ThreadableLoader.h in Headers */, 0B90561C0F2578BF0095FF6A /* ThreadableLoaderClient.h in Headers */, + 5112247410CFB8D8008099D7 /* ThreadableWebSocketChannel.h in Headers */, + 5112247610CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h in Headers */, 51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */, E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */, 185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */, + 7553CFE8108F473F00EA281E /* TimelineRecordFactory.h in Headers */, 9305B24D098F1B6B00C28855 /* Timer.h in Headers */, E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */, 49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */, @@ -18120,6 +18362,7 @@ 854FE7370A2297BE0058D7AD /* Traversal.h in Headers */, 1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */, 854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */, + 37C28A6810F659CC008C7813 /* TypesettingFeatures.h in Headers */, 93309E1A099E64920056E581 /* TypingCommand.h in Headers */, 85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */, 85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */, @@ -18149,6 +18392,26 @@ 93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */, 93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */, BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */, + A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */, + 49EECDE010503C2400099FAB /* WebGLArray.h in Headers */, + 49EECDE310503C2400099FAB /* WebGLArrayBuffer.h in Headers */, + 49C7B9C91042D32F0009D447 /* WebGLBuffer.h in Headers */, + 49C7B9CC1042D32F0009D447 /* WebGLByteArray.h in Headers */, + 6E4E91AF10F7FB3100A2779C /* WebGLContextAttributes.h in Headers */, + 49EECDE610503C2400099FAB /* WebGLFloatArray.h in Headers */, + 49C7B9CF1042D32F0009D447 /* WebGLFramebuffer.h in Headers */, + 6E47E66110B7944B00B186C8 /* WebGLGetInfo.h in Headers */, + 49EECDE910503C2400099FAB /* WebGLIntArray.h in Headers */, + 49C7B9D71042D32F0009D447 /* WebGLProgram.h in Headers */, + 49C7B9DA1042D32F0009D447 /* WebGLRenderbuffer.h in Headers */, + 49C7B9E01042D32F0009D447 /* WebGLRenderingContext.h in Headers */, + 49C7B9E31042D32F0009D447 /* WebGLShader.h in Headers */, + 49EECDEC10503C2400099FAB /* WebGLShortArray.h in Headers */, + 49C7B9E61042D32F0009D447 /* WebGLTexture.h in Headers */, + 0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */, + 49EECDEF10503C2400099FAB /* WebGLUnsignedByteArray.h in Headers */, + 49EECDF210503C2400099FAB /* WebGLUnsignedIntArray.h in Headers */, + 49EECDF510503C2400099FAB /* WebGLUnsignedShortArray.h in Headers */, 31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */, 31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */, 31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */, @@ -18223,6 +18486,7 @@ 2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */, 2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */, 0B9056F90F2685F30095FF6A /* WorkerThreadableLoader.h in Headers */, + 5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */, 93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */, 6565820209D1508D000E61D7 /* XLinkNames.h in Headers */, BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */, @@ -18230,6 +18494,7 @@ F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */, BCDFD48E0E305290009D10AD /* XMLHttpRequestUpload.h in Headers */, A833C80D0A2CF25600D57664 /* XMLNames.h in Headers */, + E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */, 1ACE53EB0A8D18E70022947D /* XMLSerializer.h in Headers */, 93F1992108245E59001E9ABC /* XMLTokenizer.h in Headers */, 5D15E3AC0F9E6AC1009E0E3F /* XMLTokenizerScope.h in Headers */, @@ -18256,6 +18521,7 @@ 93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */, E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */, 97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */, +<<<<<<< HEAD 3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */, 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */, 84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */, @@ -18295,6 +18561,8 @@ 59E842661109E5A2000305AD /* JNIBridgeJSC.h in Headers */, 59B5977511086579007159E8 /* BridgeJSC.h in Headers */, 59BD83BA11199B9000E1B6A9 /* GeolocationPositionCache.h in Headers */, +======= +>>>>>>> webkit.org at r54127 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -18374,6 +18642,8 @@ 85136C9B0AED665900F90A3D /* helpCursor.png in Resources */, 85136C9C0AED665900F90A3D /* linkCursor.png in Resources */, 1CDC14050DD3934C006EACD3 /* localizedStrings.js in Resources */, + FA654A681108ABE2002615E0 /* mathattrs.in in Resources */, + FA654A641108ABB7002615E0 /* mathml.css in Resources */, AB4261D80A2F6C9700BDD17D /* missingImage.tiff in Resources */, 85136C9D0AED665900F90A3D /* moveCursor.png in Resources */, 46F9D5DE0B0D60170028EE36 /* noDropCursor.png in Resources */, @@ -18395,8 +18665,6 @@ 85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */, 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */, 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */, - 5174E20C10A1F49A00F95E6F /* PopStateEvent.idl in Resources */, - 0C3F1F5C10C8871200D72CE1 /* WebGLUniformLocation.idl in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -18542,10 +18810,14 @@ 29A8123E0FBB9C1D00510293 /* AccessibilityListBox.cpp in Sources */, 29A8123D0FBB9C1D00510293 /* AccessibilityListBoxOption.cpp in Sources */, 07B0113D1032241900FBDC33 /* AccessibilityMediaControls.cpp in Sources */, + 76CDD2F21103DA6600680521 /* AccessibilityMenuList.cpp in Sources */, + 76CDD2F61103DA6600680521 /* AccessibilityMenuListOption.cpp in Sources */, + 76CDD2F41103DA6600680521 /* AccessibilityMenuListPopup.cpp in Sources */, 29A8123C0FBB9C1D00510293 /* AccessibilityObject.cpp in Sources */, 29A812480FBB9CA900510293 /* AccessibilityObjectMac.mm in Sources */, 29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */, 29A812260FBB9C1D00510293 /* AccessibilityRenderObject.cpp in Sources */, + 93C4F6EA1108F9A50099D0DB /* AccessibilityScrollbar.cpp in Sources */, 0709FC4C1025DED80059CDBA /* AccessibilitySlider.cpp in Sources */, 29A812270FBB9C1D00510293 /* AccessibilityTable.cpp in Sources */, 29A8122A0FBB9C1D00510293 /* AccessibilityTableCell.cpp in Sources */, @@ -18586,9 +18858,11 @@ 938192030F87E1E600D5352A /* BinaryPropertyList.cpp in Sources */, BC5EB91F0E82040800B25965 /* BindingURI.cpp in Sources */, A89943290B42338800D7C802 /* BitmapImage.cpp in Sources */, + 2EAFAF0E10E2AF2D007ED3D6 /* Blob.cpp in Sources */, 93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */, BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */, 93309DDA099E64920056E581 /* BreakBlockquoteCommand.cpp in Sources */, + 59B597731108656B007159E8 /* BridgeJSC.cpp in Sources */, 1A569CF70D7E2B82007C3983 /* c_class.cpp in Sources */, 1A569CF90D7E2B82007C3983 /* c_instance.cpp in Sources */, 1A569CFB0D7E2B82007C3983 /* c_runtime.cpp in Sources */, @@ -18606,29 +18880,14 @@ BCB16C250979C3BD00467741 /* CachedXBLDocument.cpp in Sources */, BCB16C270979C3BD00467741 /* CachedXSLStyleSheet.cpp in Sources */, 49C7BA011042D38C0009D447 /* Canvas3DLayer.mm in Sources */, - 49EECDDF10503C2400099FAB /* WebGLArray.cpp in Sources */, - 49EECDE210503C2400099FAB /* WebGLArrayBuffer.cpp in Sources */, - 49C7B9C81042D32F0009D447 /* WebGLBuffer.cpp in Sources */, - 49C7B9CB1042D32F0009D447 /* WebGLByteArray.cpp in Sources */, - 49EECDE510503C2400099FAB /* WebGLFloatArray.cpp in Sources */, - 49C7B9CE1042D32F0009D447 /* WebGLFramebuffer.cpp in Sources */, + 6E4E91AC10F7FB3100A2779C /* CanvasContextAttributes.cpp in Sources */, 49484FC1102CF23C00187DD3 /* CanvasGradient.cpp in Sources */, - 49EECDE810503C2400099FAB /* WebGLIntArray.cpp in Sources */, 49C7B9D41042D32F0009D447 /* CanvasObject.cpp in Sources */, 49484FC4102CF23C00187DD3 /* CanvasPattern.cpp in Sources */, 49484FC7102CF23C00187DD3 /* CanvasPixelArray.cpp in Sources */, - 49C7B9D61042D32F0009D447 /* WebGLProgram.cpp in Sources */, - 49C7B9D91042D32F0009D447 /* WebGLRenderbuffer.cpp in Sources */, 49C7B9DC1042D32F0009D447 /* CanvasRenderingContext.cpp in Sources */, 49484FCA102CF23C00187DD3 /* CanvasRenderingContext2D.cpp in Sources */, - 49C7B9DF1042D32F0009D447 /* WebGLRenderingContext.cpp in Sources */, - 49C7B9E21042D32F0009D447 /* WebGLShader.cpp in Sources */, - 49EECDEB10503C2400099FAB /* WebGLShortArray.cpp in Sources */, 49484FCD102CF23C00187DD3 /* CanvasStyle.cpp in Sources */, - 49C7B9E51042D32F0009D447 /* WebGLTexture.cpp in Sources */, - 49EECDEE10503C2400099FAB /* WebGLUnsignedByteArray.cpp in Sources */, - 49EECDF110503C2400099FAB /* WebGLUnsignedIntArray.cpp in Sources */, - 49EECDF410503C2400099FAB /* WebGLUnsignedShortArray.cpp in Sources */, 6550B69D099DF0270090D781 /* CDATASection.cpp in Sources */, 514185EF0CD65F0400763C99 /* ChangeVersionWrapper.cpp in Sources */, 6550B69F099DF0270090D781 /* CharacterData.cpp in Sources */, @@ -18670,6 +18929,7 @@ D0B0556909C6700100307E43 /* CreateLinkCommand.cpp in Sources */, 514C766D0CE923A1007EF3CD /* Credential.cpp in Sources */, 51A052341058774F00CC9E95 /* CredentialStorage.cpp in Sources */, + E1B4CD2510B322E200BFFD7E /* CredentialStorageMac.mm in Sources */, E1C416170F6563180092D2FB /* CrossOriginAccessControl.cpp in Sources */, E1C415DE0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp in Sources */, 2E4346580F546A9900B0F1BA /* CrossThreadCopier.cpp in Sources */, @@ -18726,6 +18986,7 @@ 1AD51A150CB59CD300953D11 /* DatabaseTracker.cpp in Sources */, BC77D2390FF298080070887B /* DataGridColumn.cpp in Sources */, BC77D1FD0FF28D9B0070887B /* DataGridColumnList.cpp in Sources */, + F5D3A57C106B83B300545297 /* DateComponents.cpp in Sources */, 4162A450101145AE00DFF3ED /* DedicatedWorkerContext.cpp in Sources */, 41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */, 4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */, @@ -18747,6 +19008,7 @@ 1A8F6BC20DB55CDC001DB794 /* DOMApplicationCache.cpp in Sources */, 85D389B30A991A7F00282145 /* DOMAttr.mm in Sources */, BC946EF0107FDBAC00857193 /* DOMBeforeLoadEvent.mm in Sources */, + 2E2D99E810E2BC1C00496337 /* DOMBlob.mm in Sources */, 85089CD80A98C42800A275AA /* DOMCDATASection.mm in Sources */, 85ACA9870A9B520300671E90 /* DOMCharacterData.mm in Sources */, 85089CDA0A98C42800A275AA /* DOMComment.mm in Sources */, @@ -19050,6 +19312,7 @@ A75E8B8A0E1DE2D6007F2481 /* FEColorMatrix.cpp in Sources */, A75E8B8C0E1DE2D6007F2481 /* FEComponentTransfer.cpp in Sources */, A75E8B8E0E1DE2D6007F2481 /* FEComposite.cpp in Sources */, + 84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */, BCDBB8CE0E08958400C60FF6 /* File.cpp in Sources */, 934FE9E50B5CA539003E4A73 /* FileChooser.cpp in Sources */, 066C772D0AB603D200238CC4 /* FileChooserMac.mm in Sources */, @@ -19102,6 +19365,7 @@ 1432E8490C51493F00B1500F /* GCController.cpp in Sources */, BCE04C940DAFF902007A0F41 /* GeneratedImage.cpp in Sources */, FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */, + BC56CB2110D5AC8000A77C64 /* GeolocationController.cpp in Sources */, FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */, BCE494AC0F4F5E9E0084E319 /* GeolocationServiceMac.mm in Sources */, 59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */, @@ -19123,6 +19387,7 @@ 5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */, 9363B62C0F8E8FE000803810 /* HistoryPropertyList.cpp in Sources */, 9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */, + BC97E23B109144950010D361 /* HTMLAllCollection.cpp in Sources */, A8CFF7A40A156978000A4234 /* HTMLAnchorElement.cpp in Sources */, A871D45E0A127CBC00B12A68 /* HTMLAppletElement.cpp in Sources */, A8EA7D2F0A19385500A8EF5F /* HTMLAreaElement.cpp in Sources */, @@ -19180,6 +19445,7 @@ A8CFF7A90A156978000A4234 /* HTMLModElement.cpp in Sources */, A8DF3FD5097FA0FC0052981B /* HTMLNameCollection.cpp in Sources */, A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */, + CE4C00E410F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp in Sources */, A871D45B0A127CBC00B12A68 /* HTMLObjectElement.cpp in Sources */, A8EA79FB0A1916DF00A8EF5F /* HTMLOListElement.cpp in Sources */, A81369DF097374F600D74463 /* HTMLOptGroupElement.cpp in Sources */, @@ -19213,7 +19479,6 @@ BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */, 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */, 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */, - F5D3A57C106B83B300545297 /* ISODateTime.cpp in Sources */, 5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */, 445C8DB710015FC90031531A /* IconDatabaseNone.cpp in Sources */, 1A2D753E0DE47FAB00F0A648 /* IconFetcher.cpp in Sources */, @@ -19232,6 +19497,7 @@ 4B3480930EEF50D400AC1B41 /* ImageSourceCGMac.mm in Sources */, 316FE1170E6E1DA700BF6088 /* ImplicitAnimation.cpp in Sources */, DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */, + 7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */, A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */, A8CFF5E40A155A05000A4234 /* InlineFlowBox.cpp in Sources */, BCEA4859097D93020094C9E4 /* InlineTextBox.cpp in Sources */, @@ -19248,6 +19514,7 @@ 7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */, 41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */, 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */, + 7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */, 41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */, 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */, B27535600B053814002CE64F /* IntPointCG.cpp in Sources */, @@ -19257,12 +19524,21 @@ B275357D0B053814002CE64F /* IntRectMac.mm in Sources */, B27535620B053814002CE64F /* IntSizeCG.cpp in Sources */, B275357E0B053814002CE64F /* IntSizeMac.mm in Sources */, + 59E560A91105336F00AA1258 /* JavaClassJSC.cpp in Sources */, + 59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */, 1C81BA090E97348300266E07 /* JavaScriptCallFrame.cpp in Sources */, 1C81BA0D0E97348300266E07 /* JavaScriptDebugServer.cpp in Sources */, 1C81BA020E9733CB00266E07 /* JavaScriptProfile.cpp in Sources */, 1C81BA000E9733CB00266E07 /* JavaScriptProfileNode.cpp in Sources */, 1A569D030D7E2B82007C3983 /* jni_jsobject.mm in Sources */, 1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */, +<<<<<<< HEAD +======= + 5913953D1107584E0083EC55 /* JNIBridge.cpp in Sources */, + 59E842681109E5AE000305AD /* JNIBridgeJSC.cpp in Sources */, + 59EE12301106081F00885116 /* JNIUtility.cpp in Sources */, + 59EE122C1106080500885116 /* JNIUtilityPrivate.cpp in Sources */, +>>>>>>> webkit.org at r54127 93309DF3099E64920056E581 /* JoinTextNodesCommand.cpp in Sources */, 418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */, 415B7C570FF598E6006770F7 /* JSAbstractWorkerCustom.cpp in Sources */, @@ -19271,47 +19547,14 @@ E4EEFFC80D34550C00469A58 /* JSAudioConstructor.cpp in Sources */, BC124EFF0C26447A009E2349 /* JSBarInfo.cpp in Sources */, BC946346107A934B00857193 /* JSBeforeLoadEvent.cpp in Sources */, + 2E2D99CD10E2BBDA00496337 /* JSBlob.cpp in Sources */, 1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */, - A7D20F62107F406900A80392 /* JSWebGLActiveInfo.cpp in Sources */, - 49EECF1B105072F300099FAB /* JSWebGLArray.cpp in Sources */, - 49EECF00105070C400099FAB /* JSWebGLArrayBuffer.cpp in Sources */, - 49EECFAB1050938200099FAB /* JSWebGLArrayBufferConstructor.cpp in Sources */, - 492273A31083B3B100EE5C84 /* JSWebGLArrayCustom.cpp in Sources */, - 49C7B9931042D2D30009D447 /* JSWebGLBuffer.cpp in Sources */, - 49C7B9951042D2D30009D447 /* JSWebGLByteArray.cpp in Sources */, - 49EECFAD1050938200099FAB /* JSWebGLByteArrayConstructor.cpp in Sources */, - 49EECF7810508D9C00099FAB /* JSWebGLByteArrayCustom.cpp in Sources */, - 49EECF02105070C400099FAB /* JSWebGLFloatArray.cpp in Sources */, - 49EECFAF1050938200099FAB /* JSWebGLFloatArrayConstructor.cpp in Sources */, - 49EECF7910508D9C00099FAB /* JSWebGLFloatArrayCustom.cpp in Sources */, - 49C7B9971042D2D30009D447 /* JSWebGLFramebuffer.cpp in Sources */, 65DF323909D1DE65000BE325 /* JSCanvasGradient.cpp in Sources */, - 49EECF04105070C400099FAB /* JSWebGLIntArray.cpp in Sources */, - 49EECFB11050938200099FAB /* JSWebGLIntArrayConstructor.cpp in Sources */, - 49EECF7A10508D9C00099FAB /* JSWebGLIntArrayCustom.cpp in Sources */, 65DF323B09D1DE65000BE325 /* JSCanvasPattern.cpp in Sources */, - 49C7B99B1042D2D30009D447 /* JSWebGLProgram.cpp in Sources */, - 49C7B99D1042D2D30009D447 /* JSWebGLRenderbuffer.cpp in Sources */, 49EED1421051969400099FAB /* JSCanvasRenderingContext.cpp in Sources */, 49EED1441051969400099FAB /* JSCanvasRenderingContext2D.cpp in Sources */, 49EED14E1051971A00099FAB /* JSCanvasRenderingContext2DCustom.cpp in Sources */, - 49EED1461051969400099FAB /* JSWebGLRenderingContext.cpp in Sources */, - 49EED14F1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp in Sources */, 49EED1501051971A00099FAB /* JSCanvasRenderingContextCustom.cpp in Sources */, - 49C7B9A21042D2D30009D447 /* JSWebGLShader.cpp in Sources */, - 49EECF06105070C400099FAB /* JSWebGLShortArray.cpp in Sources */, - 49EECFB51050938200099FAB /* JSWebGLShortArrayConstructor.cpp in Sources */, - 49EECF7B10508D9C00099FAB /* JSWebGLShortArrayCustom.cpp in Sources */, - 49C7B9A41042D2D30009D447 /* JSWebGLTexture.cpp in Sources */, - 49EECF08105070C400099FAB /* JSWebGLUnsignedByteArray.cpp in Sources */, - 49EECFB71050938200099FAB /* JSWebGLUnsignedByteArrayConstructor.cpp in Sources */, - 49EECF7C10508D9C00099FAB /* JSWebGLUnsignedByteArrayCustom.cpp in Sources */, - 49EECF0A105070C400099FAB /* JSWebGLUnsignedIntArray.cpp in Sources */, - 49EECFB91050938200099FAB /* JSWebGLUnsignedIntArrayConstructor.cpp in Sources */, - 49EECF7D10508D9C00099FAB /* JSWebGLUnsignedIntArrayCustom.cpp in Sources */, - 49EECF0C105070C400099FAB /* JSWebGLUnsignedShortArray.cpp in Sources */, - 49EECFBB1050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.cpp in Sources */, - 49EECF7E10508D9C00099FAB /* JSWebGLUnsignedShortArrayCustom.cpp in Sources */, 93F9B7A00BA6032600854064 /* JSCDATASection.cpp in Sources */, 93BA59B20F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp in Sources */, 65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */, @@ -19392,6 +19635,7 @@ E0FEF372B77C53EAC1C1FBEE /* JSEventSourceConstructor.cpp in Sources */, E0FEF372B57C53EAC1C1FBEE /* JSEventSourceCustom.cpp in Sources */, BC6090200E91B8EC000C68B5 /* JSEventTarget.cpp in Sources */, + 3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */, BC00F0140E0A189500FD04E3 /* JSFile.cpp in Sources */, BC00F0160E0A189500FD04E3 /* JSFileList.cpp in Sources */, FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */, @@ -19399,6 +19643,8 @@ FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */, BC94D14E0C275C68006BC617 /* JSHistory.cpp in Sources */, BCE7B1930D4E86960075A539 /* JSHistoryCustom.cpp in Sources */, + BC97E412109154FA0010D361 /* JSHTMLAllCollection.cpp in Sources */, + BC97E42C10915B060010D361 /* JSHTMLAllCollectionCustom.cpp in Sources */, 1A4A2DEF0A1B852A00C807F8 /* JSHTMLAnchorElement.cpp in Sources */, 1A4A2DF10A1B852A00C807F8 /* JSHTMLAppletElement.cpp in Sources */, BC4EDEF40C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp in Sources */, @@ -19487,10 +19733,11 @@ BC6C49F30D7DBA0500FFA558 /* JSImageConstructor.cpp in Sources */, A77979280D6B9E64003851B9 /* JSImageData.cpp in Sources */, A7D0318E0E93540300E24ACD /* JSImageDataCustom.cpp in Sources */, - C091588A0DB4209200E55AF4 /* JSInspectedObjectWrapper.cpp in Sources */, + 7A0E76DA10BF059800A0276E /* JSInjectedScriptHost.cpp in Sources */, + 7A0E76D510BF050700A0276E /* JSInjectedScriptHostCustom.cpp in Sources */, 41F060CD0F5EEB2B00A07EAC /* JSInspectorBackend.cpp in Sources */, + 7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */, 7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */, - C091588C0DB4209200E55AF4 /* JSInspectorCallbackWrapper.cpp in Sources */, 1C5FAED10DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp in Sources */, 1C5FAEE70DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp in Sources */, A86629D409DA2B48009633A5 /* JSKeyboardEvent.cpp in Sources */, @@ -19536,10 +19783,11 @@ A9C6E64C0D7465E7006442E9 /* JSPluginArrayCustom.cpp in Sources */, A9C6E64D0D7465E7006442E9 /* JSPluginCustom.cpp in Sources */, 93B70D6B09EB0C7C009D8468 /* JSPluginElementFunctions.cpp in Sources */, + 5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */, + 5189F01810B3781300F3C739 /* JSPopStateEventCustom.cpp in Sources */, FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */, 65DF31FF09D1CC60000BE325 /* JSProcessingInstruction.cpp in Sources */, E44613ED0CD681BA00FADA75 /* JSProgressEvent.cpp in Sources */, - C091588E0DB4209200E55AF4 /* JSQuarantinedObjectWrapper.cpp in Sources */, 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */, D23CA55F0AB0EAB6005108A5 /* JSRangeException.cpp in Sources */, BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */, @@ -19672,7 +19920,6 @@ B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */, 8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */, B2FA3DE20AB75A6F000E5AC4 /* JSSVGPointList.cpp in Sources */, - 516BB7930CE91E6800512F79 /* JSSVGPointListCustom.cpp in Sources */, B2FA3DE50AB75A6F000E5AC4 /* JSSVGPolygonElement.cpp in Sources */, B2FA3DE70AB75A6F000E5AC4 /* JSSVGPolylineElement.cpp in Sources */, B2FA3DE90AB75A6F000E5AC4 /* JSSVGPreserveAspectRatio.cpp in Sources */, @@ -19695,7 +19942,6 @@ B2FA3E080AB75A6F000E5AC4 /* JSSVGTitleElement.cpp in Sources */, B2FA3E0A0AB75A6F000E5AC4 /* JSSVGTransform.cpp in Sources */, B2FA3E0C0AB75A6F000E5AC4 /* JSSVGTransformList.cpp in Sources */, - B2D3FC8A0C2212CB00CF3618 /* JSSVGTransformListCustom.cpp in Sources */, B2FA3E0E0AB75A6F000E5AC4 /* JSSVGTRefElement.cpp in Sources */, B2FA3E100AB75A6F000E5AC4 /* JSSVGTSpanElement.cpp in Sources */, B2FA3E120AB75A6F000E5AC4 /* JSSVGUnitTypes.cpp in Sources */, @@ -19711,6 +19957,42 @@ 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */, A86629D009DA2B48009633A5 /* JSUIEvent.cpp in Sources */, 15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */, + A7D20F62107F406900A80392 /* JSWebGLActiveInfo.cpp in Sources */, + 49EECF1B105072F300099FAB /* JSWebGLArray.cpp in Sources */, + 49EECF00105070C400099FAB /* JSWebGLArrayBuffer.cpp in Sources */, + 49EECFAB1050938200099FAB /* JSWebGLArrayBufferConstructor.cpp in Sources */, + 492273A31083B3B100EE5C84 /* JSWebGLArrayCustom.cpp in Sources */, + 49C7B9931042D2D30009D447 /* JSWebGLBuffer.cpp in Sources */, + 49C7B9951042D2D30009D447 /* JSWebGLByteArray.cpp in Sources */, + 49EECFAD1050938200099FAB /* JSWebGLByteArrayConstructor.cpp in Sources */, + 49EECF7810508D9C00099FAB /* JSWebGLByteArrayCustom.cpp in Sources */, + 6EE8A77210F803F3005A4A24 /* JSWebGLContextAttributes.cpp in Sources */, + 49EECF02105070C400099FAB /* JSWebGLFloatArray.cpp in Sources */, + 49EECFAF1050938200099FAB /* JSWebGLFloatArrayConstructor.cpp in Sources */, + 49EECF7910508D9C00099FAB /* JSWebGLFloatArrayCustom.cpp in Sources */, + 49C7B9971042D2D30009D447 /* JSWebGLFramebuffer.cpp in Sources */, + 49EECF04105070C400099FAB /* JSWebGLIntArray.cpp in Sources */, + 49EECFB11050938200099FAB /* JSWebGLIntArrayConstructor.cpp in Sources */, + 49EECF7A10508D9C00099FAB /* JSWebGLIntArrayCustom.cpp in Sources */, + 49C7B99B1042D2D30009D447 /* JSWebGLProgram.cpp in Sources */, + 49C7B99D1042D2D30009D447 /* JSWebGLRenderbuffer.cpp in Sources */, + 49EED1461051969400099FAB /* JSWebGLRenderingContext.cpp in Sources */, + 49EED14F1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp in Sources */, + 49C7B9A21042D2D30009D447 /* JSWebGLShader.cpp in Sources */, + 49EECF06105070C400099FAB /* JSWebGLShortArray.cpp in Sources */, + 49EECFB51050938200099FAB /* JSWebGLShortArrayConstructor.cpp in Sources */, + 49EECF7B10508D9C00099FAB /* JSWebGLShortArrayCustom.cpp in Sources */, + 49C7B9A41042D2D30009D447 /* JSWebGLTexture.cpp in Sources */, + 0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */, + 49EECF08105070C400099FAB /* JSWebGLUnsignedByteArray.cpp in Sources */, + 49EECFB71050938200099FAB /* JSWebGLUnsignedByteArrayConstructor.cpp in Sources */, + 49EECF7C10508D9C00099FAB /* JSWebGLUnsignedByteArrayCustom.cpp in Sources */, + 49EECF0A105070C400099FAB /* JSWebGLUnsignedIntArray.cpp in Sources */, + 49EECFB91050938200099FAB /* JSWebGLUnsignedIntArrayConstructor.cpp in Sources */, + 49EECF7D10508D9C00099FAB /* JSWebGLUnsignedIntArrayCustom.cpp in Sources */, + 49EECF0C105070C400099FAB /* JSWebGLUnsignedShortArray.cpp in Sources */, + 49EECFBB1050938200099FAB /* JSWebGLUnsignedShortArrayConstructor.cpp in Sources */, + 49EECF7E10508D9C00099FAB /* JSWebGLUnsignedShortArrayCustom.cpp in Sources */, 31C0FF3D0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp in Sources */, 316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */, 316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */, @@ -19779,6 +20061,7 @@ FABE72F61059C1EB00D999DD /* MathMLInlineContainerElement.cpp in Sources */, FABE72F81059C1EB00D999DD /* MathMLMathElement.cpp in Sources */, FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */, + FA654A6B1108ABED002615E0 /* MathMLTextElement.cpp in Sources */, 49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */, 49E911C60EF86D47009D0CAF /* MatrixTransformOperation.cpp in Sources */, 0FF50271102BA96A0066F39A /* Media.cpp in Sources */, @@ -19832,6 +20115,7 @@ 1A569D1A0D7E2B82007C3983 /* objc_utility.mm in Sources */, 1CF6BDFB0E9BB26A0025E1CD /* ObjCEventListener.mm in Sources */, 1CF6BE140E9BB4670025E1CD /* ObjCNodeFilterCondition.mm in Sources */, + F4EAF4AE10C742B1009100D3 /* OpenTypeSanitizer.cpp in Sources */, 087281550F26B9B600AFC596 /* OptionElement.cpp in Sources */, 087281570F26B9B600AFC596 /* OptionGroupElement.cpp in Sources */, 0014628A103CD1DE000B20DB /* OriginAccessEntry.cpp in Sources */, @@ -19865,9 +20149,11 @@ 1AC694C70A3B1676003F5049 /* PluginDocument.cpp in Sources */, 7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */, 1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */, + 0AFDAC3B10F5448300E1F3D2 /* PluginWidgetMac.mm in Sources */, B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */, 97059977107D975200A50A7C /* PolicyCallback.cpp in Sources */, 97059979107D975200A50A7C /* PolicyChecker.cpp in Sources */, + 5189F0DE10B46B0E00F3C739 /* PopStateEvent.cpp in Sources */, 0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */, 93F19AF808245E59001E9ABC /* Position.cpp in Sources */, 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */, @@ -19896,6 +20182,7 @@ BCEA4865097D93020094C9E4 /* RenderButton.cpp in Sources */, 9392F1440AD185FE00691BD4 /* RenderCounter.cpp in Sources */, BC77CEC80FF01CBE0070887B /* RenderDataGrid.cpp in Sources */, + 0F5B7A5410F65D7A00376302 /* RenderEmbeddedObject.cpp in Sources */, A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */, 066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */, BCEA486D097D93020094C9E4 /* RenderFlexibleBox.cpp in Sources */, @@ -19914,6 +20201,7 @@ A8EA7A4E0A191A5200A8EF5F /* RenderListItem.cpp in Sources */, A8EA7A510A191A5200A8EF5F /* RenderListMarker.cpp in Sources */, 0F5602900E4B76580065B038 /* RenderMarquee.cpp in Sources */, + FA654A6F1108ABFF002615E0 /* RenderMathMLBlock.cpp in Sources */, E4C279580CF9741900E97B98 /* RenderMedia.cpp in Sources */, ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */, BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */, @@ -19923,6 +20211,10 @@ 853CA9F00AEEC657002372DC /* RenderPath.cpp in Sources */, A871DFE20A15376B00B12A68 /* RenderReplaced.cpp in Sources */, BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */, + 1479FAED109AE37500DED655 /* RenderRuby.cpp in Sources */, + 1479FAEF109AE37500DED655 /* RenderRubyBase.cpp in Sources */, + 1479FAF1109AE37500DED655 /* RenderRubyRun.cpp in Sources */, + 1479FAF3109AE37500DED655 /* RenderRubyText.cpp in Sources */, BC3BE9930E9C1C7C00835588 /* RenderScrollbar.cpp in Sources */, BC3BE9AB0E9C242000835588 /* RenderScrollbarPart.cpp in Sources */, BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */, @@ -19937,6 +20229,7 @@ 853CA9DC0AEEC5E9002372DC /* RenderSVGInlineText.cpp in Sources */, A8F5C0B90F9285AC0098E06B /* RenderSVGModelObject.cpp in Sources */, AA31B5B40C1DFD1000AE7083 /* RenderSVGRoot.cpp in Sources */, + 08DAB9BA1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp in Sources */, 853CA9DE0AEEC5E9002372DC /* RenderSVGText.cpp in Sources */, B26554EA0B80D74900A50EC3 /* RenderSVGTextPath.cpp in Sources */, A8A909AD0CBCD6B50029B807 /* RenderSVGTransformableContainer.cpp in Sources */, @@ -19968,6 +20261,7 @@ 514C76510CE9234E007EF3CD /* ResourceHandleMac.mm in Sources */, 93E227E30AF589AD00D48324 /* ResourceLoader.cpp in Sources */, 51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */, + 973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */, 514C767C0CE923A1007EF3CD /* ResourceRequestBase.cpp in Sources */, 514C76530CE9234E007EF3CD /* ResourceRequestMac.mm in Sources */, 514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */, @@ -20040,6 +20334,7 @@ 4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */, 84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */, 84A81F410FC7E02700955300 /* SourceGraphic.cpp in Sources */, + D01A27AD10C9BFD800026A42 /* SpaceSplitString.cpp in Sources */, 93309E11099E64920056E581 /* SplitElementCommand.cpp in Sources */, 93309E13099E64920056E581 /* SplitTextNodeCommand.cpp in Sources */, 93309E15099E64920056E581 /* SplitTextNodeContainingElementCommand.cpp in Sources */, @@ -20190,6 +20485,7 @@ B2227A3B0D00BF220071B782 /* SVGLineElement.cpp in Sources */, B2227A400D00BF220071B782 /* SVGLocatable.cpp in Sources */, B2227A430D00BF220071B782 /* SVGMarkerElement.cpp in Sources */, + 08735FB810E91232006D6FAD /* SVGMarkerLayoutInfo.cpp in Sources */, B2227A460D00BF220071B782 /* SVGMaskElement.cpp in Sources */, B2227A4A0D00BF220071B782 /* SVGMetadataElement.cpp in Sources */, B2A1F2B00CEF0ABF00442F6A /* SVGMissingGlyphElement.cpp in Sources */, @@ -20236,6 +20532,7 @@ 853CA9E80AEEC608002372DC /* SVGRootInlineBox.cpp in Sources */, B2227AA20D00BF220071B782 /* SVGScriptElement.cpp in Sources */, B2227AA50D00BF220071B782 /* SVGSetElement.cpp in Sources */, + 08DAB9C21103D9C1003E7ABA /* SVGShadowTreeElements.cpp in Sources */, E4AFD00F0DAF335500F5F55C /* SVGSMILElement.cpp in Sources */, B2227AA80D00BF220071B782 /* SVGStopElement.cpp in Sources */, B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */, @@ -20265,7 +20562,6 @@ B2227AF20D00BF220071B782 /* SVGViewSpec.cpp in Sources */, B2227AF50D00BF220071B782 /* SVGZoomAndPan.cpp in Sources */, B2E4EC970D00C22B00432643 /* SVGZoomEvent.cpp in Sources */, - 0878B1FE10874E3F00A55097 /* SynchronizablePropertyController.cpp in Sources */, 6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */, BCE3BEC20D222B1D007E06E4 /* TagNodeList.cpp in Sources */, 6550B6A5099DF0270090D781 /* Text.cpp in Sources */, @@ -20290,9 +20586,11 @@ BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */, BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */, 0B90561E0F257E930095FF6A /* ThreadableLoader.cpp in Sources */, + 5112247210CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */, 185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */, + 7553CFE9108F473F00EA281E /* TimelineRecordFactory.cpp in Sources */, 93309EA4099EB78C0056E581 /* Timer.cpp in Sources */, E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */, 49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */, @@ -20323,6 +20621,25 @@ 93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */, 93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */, BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */, + 49EECDDF10503C2400099FAB /* WebGLArray.cpp in Sources */, + 49EECDE210503C2400099FAB /* WebGLArrayBuffer.cpp in Sources */, + 49C7B9C81042D32F0009D447 /* WebGLBuffer.cpp in Sources */, + 49C7B9CB1042D32F0009D447 /* WebGLByteArray.cpp in Sources */, + 6E4E91AE10F7FB3100A2779C /* WebGLContextAttributes.cpp in Sources */, + 49EECDE510503C2400099FAB /* WebGLFloatArray.cpp in Sources */, + 49C7B9CE1042D32F0009D447 /* WebGLFramebuffer.cpp in Sources */, + 6E47E66010B7944B00B186C8 /* WebGLGetInfo.cpp in Sources */, + 49EECDE810503C2400099FAB /* WebGLIntArray.cpp in Sources */, + 49C7B9D61042D32F0009D447 /* WebGLProgram.cpp in Sources */, + 49C7B9D91042D32F0009D447 /* WebGLRenderbuffer.cpp in Sources */, + 49C7B9DF1042D32F0009D447 /* WebGLRenderingContext.cpp in Sources */, + 49C7B9E21042D32F0009D447 /* WebGLShader.cpp in Sources */, + 49EECDEB10503C2400099FAB /* WebGLShortArray.cpp in Sources */, + 49C7B9E51042D32F0009D447 /* WebGLTexture.cpp in Sources */, + 0C3F1F5A10C8871200D72CE1 /* WebGLUniformLocation.cpp in Sources */, + 49EECDEE10503C2400099FAB /* WebGLUnsignedByteArray.cpp in Sources */, + 49EECDF110503C2400099FAB /* WebGLUnsignedIntArray.cpp in Sources */, + 49EECDF410503C2400099FAB /* WebGLUnsignedShortArray.cpp in Sources */, 31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */, 31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */, 31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */, @@ -20389,11 +20706,13 @@ A7D6B34A0F61104500B79FD1 /* WorkerScriptLoader.cpp in Sources */, 2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */, 0B9056F80F2685F30095FF6A /* WorkerThreadableLoader.cpp in Sources */, + 5112247810CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp in Sources */, 93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */, A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */, BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */, BCDFD48F0E305290009D10AD /* XMLHttpRequestUpload.cpp in Sources */, A833C80C0A2CF25600D57664 /* XMLNames.cpp in Sources */, + E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */, 1ACE53EA0A8D18E70022947D /* XMLSerializer.cpp in Sources */, 93F19ABC08245E59001E9ABC /* XMLTokenizer.cpp in Sources */, 54C50F7B0E801DF3009832A0 /* XMLTokenizerLibxml2.cpp in Sources */, @@ -20421,6 +20740,7 @@ 93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */, E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */, 97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */, +<<<<<<< HEAD 3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */, 973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */, 84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */, @@ -20455,6 +20775,8 @@ 59E842681109E5AE000305AD /* JNIBridgeJSC.cpp in Sources */, 59B597731108656B007159E8 /* BridgeJSC.cpp in Sources */, 59BD83BC11199B9C00E1B6A9 /* GeolocationPositionCache.cpp in Sources */, +======= +>>>>>>> webkit.org at r54127 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -20501,10 +20823,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */; buildSettings = { - BUILD_VARIANTS = ( - normal, - debug, - ); + BUILD_VARIANTS = normal; }; name = Production; }; |