forked from WebKit/WebKit-http
-
Notifications
You must be signed in to change notification settings - Fork 1
/
mergelog.log
3205 lines (3203 loc) · 147 KB
/
mergelog.log
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
--- Merging (from foreign repository) r54662 through r54683 into 'local':
U local/JavaScriptCore/runtime/Collector.cpp
U local/JavaScriptCore/runtime/CollectorHeapIterator.h
U local/JavaScriptCore/runtime/Collector.h
U local/JavaScriptCore/ChangeLog
U local/JavaScriptCore/JavaScriptCore.exp
U local/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
U local/WebKit/mac/ChangeLog
U local/WebKit/mac/Misc/WebCoreStatistics.h
U local/WebKit/mac/Misc/WebCoreStatistics.mm
U local/WebKit/chromium/ChangeLog
U local/WebKit/chromium/src/js/ProfilerAgent.js
U local/WebKit/win/WebView.cpp
U local/WebCore/WebCore.pro
U local/WebCore/ChangeLog
U local/WebCore/WebCore.vcproj/WebCore.vcproj
U local/WebCore/page/DOMWindow.idl
U local/WebCore/GNUmakefile.am
U local/WebCore/platform/graphics/GraphicsContext3D.h
U local/WebCore/WebCore.gypi
U local/WebCore/bindings/scripts/CodeGeneratorV8.pm
U local/WebCore/bindings/v8/V8DOMWrapper.cpp
U local/WebCore/bindings/v8/V8DOMWrapper.h
A local/WebCore/rendering/BidiRun.cpp
U local/WebCore/rendering/RenderSVGModelObject.cpp
U local/WebCore/rendering/RenderBlockLineLayout.cpp
A local/WebCore/rendering/InlineIterator.h
U local/WebCore/rendering/RenderBlock.h
U local/WebCore/rendering/SVGRenderSupport.cpp
U local/WebCore/rendering/RenderSVGImage.cpp
U local/WebCore/rendering/RenderSVGText.cpp
U local/WebCore/rendering/RenderSVGRoot.h
A local/WebCore/rendering/BidiRun.h
U local/WebCore/rendering/RenderSVGImage.h
U local/WebCore/rendering/SVGRootInlineBox.h
U local/WebCore/WebCore.xcodeproj/project.pbxproj
U local/ChangeLog
C local/LayoutTests
U local/configure.ac
U local/WebKitTools/Scripts/check-for-global-initializers
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
U local/WebKitTools/ChangeLog
Summary of conflicts:
Tree conflicts: 1
--- Merging (from foreign repository) r54684 through r54986 into 'local':
U local/JavaScriptCore/runtime/Structure.h
U local/JavaScriptCore/runtime/JSString.h
U local/JavaScriptCore/runtime/Identifier.cpp
U local/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
U local/JavaScriptCore/runtime/JSONObject.cpp
U local/JavaScriptCore/runtime/JSString.cpp
U local/JavaScriptCore/runtime/UStringImpl.h
U local/JavaScriptCore/runtime/Identifier.h
U local/JavaScriptCore/runtime/ArrayPrototype.cpp
U local/JavaScriptCore/runtime/NumberPrototype.cpp
U local/JavaScriptCore/runtime/SmallStrings.cpp
U local/JavaScriptCore/runtime/Structure.cpp
U local/JavaScriptCore/runtime/StringPrototype.cpp
U local/JavaScriptCore/runtime/UString.h
U local/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
U local/JavaScriptCore/runtime/UString.cpp
U local/JavaScriptCore/runtime/Collector.cpp
U local/JavaScriptCore/runtime/Operations.h
U local/JavaScriptCore/runtime/JSPropertyNameIterator.h
U local/JavaScriptCore/runtime/UStringImpl.cpp
U local/JavaScriptCore/runtime/StructureTransitionTable.h
U local/JavaScriptCore/runtime/RegExp.cpp
U local/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h
U local/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp
U local/JavaScriptCore/qt/api/qscriptvalue_p.h
U local/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
U local/JavaScriptCore/bytecompiler/NodesCodegen.cpp
U local/JavaScriptCore/wtf/gtk/GOwnPtr.cpp
U local/JavaScriptCore/wtf/gtk/GOwnPtr.h
D local/JavaScriptCore/wtf/PtrAndFlags.h
U local/JavaScriptCore/wtf/PassRefPtr.h
U local/JavaScriptCore/wtf/AlwaysInline.h
U local/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
U local/JavaScriptCore/wtf/RefPtr.h
A local/JavaScriptCore/wtf/Complex.h
C local/JavaScriptCore/wtf/MathExtras.h
U local/JavaScriptCore/interpreter/Interpreter.cpp
U local/JavaScriptCore/API/JSStringRef.h
U local/JavaScriptCore/API/APIShims.h
U local/JavaScriptCore/API/JSClassRef.cpp
U local/JavaScriptCore/API/JSContextRef.cpp
U local/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
U local/JavaScriptCore/create_rvct_stubs
U local/JavaScriptCore/jit/JITOpcodes.cpp
U local/JavaScriptCore/jit/JITStubs.cpp
U local/JavaScriptCore/jit/JITPropertyAccess.cpp
U local/JavaScriptCore/jit/JIT.cpp
U local/JavaScriptCore/ChangeLog
U local/JavaScriptCore/bytecode/CodeBlock.cpp
U local/JavaScriptCore/bytecode/CodeBlock.h
U local/JavaScriptCore/bytecode/EvalCodeCache.h
U local/JavaScriptCore/JavaScriptCore.exp
U local/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
U local/WebKitLibraries/ChangeLog
U local/WebKitLibraries/win/tools/vsprops/common.vsprops
U local/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
U local/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
U local/WebKitLibraries/win/lib/WebKitSystemInterface.lib
U local/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
U local/WebKit.pro
U local/WebKit/mac/Plugins/WebNetscapePluginView.mm
U local/WebKit/mac/Plugins/WebNetscapePluginView.h
U local/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
U local/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs
U local/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm
U local/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
U local/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
U local/WebKit/mac/Plugins/Hosted/ProxyInstance.mm
U local/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
U local/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
U local/WebKit/mac/WebCoreSupport/WebChromeClient.mm
U local/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
U local/WebKit/mac/WebCoreSupport/WebChromeClient.h
U local/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
U local/WebKit/mac/ChangeLog
U local/WebKit/mac/Misc/WebKitStatistics.h
U local/WebKit/mac/WebView/WebPreferencesPrivate.h
U local/WebKit/mac/WebView/WebViewInternal.h
U local/WebKit/mac/WebView/WebPDFRepresentation.mm
U local/WebKit/mac/WebView/WebFrameInternal.h
U local/WebKit/mac/WebView/WebPDFDocumentExtras.h
U local/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
U local/WebKit/mac/WebView/WebFrameView.mm
U local/WebKit/mac/WebView/WebHTMLRepresentation.mm
U local/WebKit/mac/WebView/WebPDFDocumentExtras.mm
U local/WebKit/mac/WebView/WebView.mm
U local/WebKit/mac/WebView/WebDataSource.mm
U local/WebKit/mac/WebView/WebFrame.mm
U local/WebKit/mac/WebView/WebHTMLView.mm
U local/WebKit/mac/WebView/WebPreferences.mm
U local/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
C local/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
U local/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
C local/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
U local/WebKit/haiku/ChangeLog
U local/WebKit/chromium/WebKit.gyp
U local/WebKit/chromium/features.gypi
U local/WebKit/chromium/ChangeLog
U local/WebKit/chromium/src/FrameLoaderClientImpl.h
U local/WebKit/chromium/src/WebSettingsImpl.cpp
U local/WebKit/chromium/src/js/devTools.css
U local/WebKit/chromium/src/js/DebuggerAgent.js
U local/WebKit/chromium/src/ChromeClientImpl.cpp
U local/WebKit/chromium/src/ChromiumBridge.cpp
U local/WebKit/chromium/src/WebStorageAreaImpl.h
U local/WebKit/chromium/src/ChromeClientImpl.h
U local/WebKit/chromium/src/WebDragData.cpp
U local/WebKit/chromium/src/StorageNamespaceProxy.cpp
U local/WebKit/chromium/src/WebFrameImpl.cpp
U local/WebKit/chromium/src/GraphicsContext3D.cpp
A local/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
U local/WebKit/chromium/src/WebFrameImpl.h
U local/WebKit/chromium/src/WebElement.cpp
U local/WebKit/chromium/src/WebDocument.cpp
U local/WebKit/chromium/src/WebSettingsImpl.h
U local/WebKit/chromium/src/WebInputElement.cpp
U local/WebKit/chromium/src/WebStorageAreaImpl.cpp
U local/WebKit/chromium/src/FrameLoaderClientImpl.cpp
U local/WebKit/chromium/src/WebFormElement.cpp
U local/WebKit/chromium/src/DebuggerAgentImpl.cpp
U local/WebKit/chromium/public/WebStorageArea.h
U local/WebKit/chromium/public/WebSettings.h
A local/WebKit/chromium/public/WebCookieJar.h
U local/WebKit/chromium/public/WebDragData.h
U local/WebKit/chromium/public/WebDocument.h
U local/WebKit/chromium/public/WebFrame.h
A local/WebKit/chromium/public/GeolocationServiceBridgeChromium.h
U local/WebKit/chromium/public/WebViewClient.h
U local/WebKit/chromium/public/WebKitClient.h
U local/WebKit/chromium/public/WebFrameClient.h
U local/WebKit/qt/QGVLauncher/main.cpp
U local/WebKit/qt/symbian/eabi/QtWebKitu.def
U local/WebKit/qt/tests/hybridPixmap/test.html
U local/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
U local/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
U local/WebKit/qt/tests/tests.pri
U local/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
U local/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
U local/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
U local/WebKit/qt/WebCoreSupport/ChromeClientQt.h
U local/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
U local/WebKit/qt/ChangeLog
U local/WebKit/qt/Api/qgraphicswebview.cpp
U local/WebKit/qt/Api/qwebframe.h
U local/WebKit/qt/Api/qwebsettings.h
U local/WebKit/qt/Api/qwebpage.cpp
U local/WebKit/qt/Api/DerivedSources.pro
U local/WebKit/qt/Api/qwebframe.cpp
U local/WebKit/qt/Api/qwebelement.h
U local/WebKit/qt/Api/qwebsettings.cpp
U local/WebKit/qt/Api/qgraphicswebview.h
A local/WebKit/qt/Api/headers.pri
U local/WebKit/qt/Api/qwebframe_p.h
U local/WebKit/gtk/tests/testdownload.c
U local/WebKit/gtk/tests/testwebview.c
U local/WebKit/gtk/tests/testmimehandling.c
U local/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
U local/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
U local/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
U local/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
U local/WebKit/gtk/webkit/webkitdownload.cpp
U local/WebKit/gtk/webkit/webkitwebsettings.cpp
U local/WebKit/gtk/webkit/webkitwebview.cpp
U local/WebKit/gtk/ChangeLog
U local/WebKit/gtk/docs/webkitgtk-sections.txt
U local/WebKit/gtk/docs/webkitgtk.types
U local/WebKit/gtk/po/pt_BR.po
U local/WebKit/gtk/po/es.po
U local/WebKit/gtk/po/webkit.pot
U local/WebKit/gtk/po/nl.po
U local/WebKit/gtk/po/ChangeLog
U local/WebKit/gtk/po/en_GB.po
U local/WebKit/gtk/po/it.po
U local/WebKit/gtk/po/sr@latin.po
U local/WebKit/gtk/po/vi.po
U local/WebKit/gtk/po/lt.po
U local/WebKit/gtk/po/sr.po
U local/WebKit/gtk/po/ru.po
U local/WebKit/gtk/po/de.po
U local/WebKit/gtk/po/sv.po
A local/WebKit/gtk/po/he.po
A local/WebKit/gtk/po/pa.po
U local/WebKit/gtk/po/zh_CN.po
U local/WebKit/win/WebPreferences.h
U local/WebKit/win/ChangeLog
U local/WebKit/win/WebView.cpp
U local/WebKit/win/WebPreferenceKeysPrivate.h
U local/WebKit/win/WebPreferences.cpp
U local/WebKit/win/WebFrame.h
U local/WebKit/win/Interfaces/WebKit.idl
U local/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
U local/WebKit/win/Interfaces/IWebFramePrivate.idl
U local/WebKit/win/WebCoreSupport/WebChromeClient.cpp
U local/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
U local/WebKit/win/WebCoreSupport/WebChromeClient.h
U local/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
U local/WebKit/win/WebFrame.cpp
U local/WebKit/win/WebKitGraphics.cpp
U local/WebKit/win/WebKit.vcproj/WebKit.def
U local/WebKit/win/WebKit.vcproj/WebKit_debug.def
U local/WebKit/win/WebKitGraphics.h
U local/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
U local/WebKit/wx/WebKitSupport/ChromeClientWx.h
U local/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
U local/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
U local/WebKit/wx/ChangeLog
U local/WebCore/Android.derived.jscbindings.mk
U local/WebCore/storage/OriginUsageRecord.cpp
U local/WebCore/dom/Document.cpp
U local/WebCore/dom/Node.cpp
U local/WebCore/Android.derived.v8bindings.mk
U local/WebCore/plugins/PluginView.h
U local/WebCore/plugins/qt/PluginPackageQt.cpp
U local/WebCore/plugins/gtk/PluginViewGtk.cpp
U local/WebCore/plugins/gtk/PluginPackageGtk.cpp
U local/WebCore/plugins/PluginPackage.cpp
U local/WebCore/plugins/mac/PluginPackageMac.cpp
U local/WebCore/plugins/PluginDatabase.cpp
U local/WebCore/plugins/PluginView.cpp
U local/WebCore/plugins/win/PluginPackageWin.cpp
U local/WebCore/plugins/PluginPackage.h
U local/WebCore/plugins/symbian/PluginPackageSymbian.cpp
U local/WebCore/editing/ReplaceSelectionCommand.cpp
U local/WebCore/editing/SelectionController.h
U local/WebCore/editing/ReplaceSelectionCommand.h
U local/WebCore/editing/SelectionController.cpp
U local/WebCore/WebCore.pro
U local/WebCore/ChangeLog
U local/WebCore/WebCore.vcproj/WebCore.vcproj
U local/WebCore/WebCore.base.exp
U local/WebCore/wml/WMLInputElement.h
U local/WebCore/wml/WMLInputElement.cpp
U local/WebCore/page/Settings.h
U local/WebCore/page/DOMWindow.h
U local/WebCore/page/Page.cpp
U local/WebCore/page/SecurityOrigin.cpp
U local/WebCore/page/ChromeClient.h
U local/WebCore/page/DOMTimer.h
U local/WebCore/page/Frame.h
U local/WebCore/page/DOMWindow.cpp
U local/WebCore/page/win/PageWin.cpp
U local/WebCore/page/Page.h
U local/WebCore/page/Chrome.h
U local/WebCore/page/Chrome.cpp
A local/WebCore/page/MediaCanStartListener.h
U local/WebCore/page/Settings.cpp
U local/WebCore/page/Geolocation.h
U local/WebCore/page/DOMTimer.cpp
U local/WebCore/page/SecurityOrigin.h
U local/WebCore/page/Frame.cpp
U local/WebCore/GNUmakefile.am
A local/WebCore/platform/chromium/GeolocationServiceChromium.h
U local/WebCore/platform/chromium/ChromiumDataObject.cpp
U local/WebCore/platform/chromium/ClipboardChromium.cpp
U local/WebCore/platform/chromium/ChromiumBridge.h
U local/WebCore/platform/chromium/ChromiumDataObject.h
U local/WebCore/platform/chromium/GeolocationServiceChromium.cpp
U local/WebCore/platform/FileChooser.cpp
U local/WebCore/platform/text/StringImpl.cpp
U local/WebCore/platform/text/AtomicString.cpp
U local/WebCore/platform/text/StringImpl.h
U local/WebCore/platform/qt/CookieJarQt.cpp
U local/WebCore/platform/gtk/RenderThemeGtk.cpp
U local/WebCore/platform/gtk/WidgetGtk.cpp
A local/WebCore/platform/brew/SystemTimeBrew.cpp
A local/WebCore/platform/brew/PlatformKeyboardEventBrew.cpp
A local/WebCore/platform/brew/CursorBrew.cpp
U local/WebCore/platform/mac/CookieJar.mm
C local/WebCore/platform/haiku/FileSystemHaiku.cpp
U local/WebCore/platform/haiku/CookieJarHaiku.cpp
U local/WebCore/platform/GeolocationService.cpp
U local/WebCore/platform/FileChooser.h
U local/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
U local/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
U local/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
U local/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
U local/WebCore/platform/graphics/qt/IconQt.cpp
U local/WebCore/platform/graphics/gtk/IconGtk.cpp
U local/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
U local/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h
U local/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp
U local/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h
U local/WebCore/platform/graphics/mac/IconMac.mm
U local/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
U local/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
U local/WebCore/platform/graphics/mac/ComplexTextController.cpp
U local/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
U local/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
U local/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
U local/WebCore/platform/graphics/mac/ComplexTextController.h
U local/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
U local/WebCore/platform/graphics/FloatRect.h
U local/WebCore/platform/graphics/Icon.h
U local/WebCore/platform/graphics/MediaPlayer.h
U local/WebCore/platform/graphics/GraphicsContext3D.h
U local/WebCore/platform/graphics/Gradient.h
U local/WebCore/platform/graphics/FloatSize.h
U local/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
A local/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
A local/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
U local/WebCore/platform/graphics/cg/GradientCG.cpp
U local/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h
U local/WebCore/platform/graphics/win/IconWin.cpp
U local/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
U local/WebCore/platform/graphics/MediaPlayerPrivate.h
U local/WebCore/platform/graphics/BitmapImage.cpp
A local/WebCore/platform/graphics/GraphicsContext3D.cpp
U local/WebCore/platform/graphics/MediaPlayer.cpp
U local/WebCore/platform/Logging.cpp
U local/WebCore/platform/GeolocationService.h
U local/WebCore/platform/network/android/CookieJarAndroid.cpp
U local/WebCore/platform/network/chromium/ResourceRequest.cpp
U local/WebCore/platform/network/chromium/CookieJarChromium.cpp
U local/WebCore/platform/network/soup/ResourceHandleSoup.cpp
U local/WebCore/platform/network/soup/CookieJarSoup.cpp
A local/WebCore/platform/network/brew
A local/WebCore/platform/network/brew/DNSBrew.cpp
U local/WebCore/platform/network/curl/CookieJarCurl.cpp
U local/WebCore/platform/network/win/CookieJarCFNetWin.cpp
U local/WebCore/platform/network/win/CookieJarWin.cpp
U local/WebCore/platform/CookieJar.h
U local/WebCore/platform/PlatformKeyboardEvent.h
U local/WebCore/platform/Logging.h
U local/WebCore/platform/image-decoders/png/PNGImageDecoder.h
U local/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
U local/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp
U local/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
U local/WebCore/platform/image-decoders/gif/GIFImageReader.h
U local/WebCore/platform/image-decoders/gif/GIFImageDecoder.h
U local/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
U local/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
U local/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h
U local/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
U local/WebCore/platform/image-decoders/ImageDecoder.cpp
U local/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp
U local/WebCore/platform/image-decoders/ico/ICOImageDecoder.h
U local/WebCore/platform/image-decoders/ImageDecoder.h
U local/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp
U local/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
U local/WebCore/platform/image-decoders/bmp/BMPImageReader.h
U local/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h
U local/WebCore/WebCore.gyp/WebCore.gyp
U local/WebCore/workers/WorkerThread.cpp
U local/WebCore/WebCore.gypi
U local/WebCore/bindings/scripts/CodeGeneratorV8.pm
A local/WebCore/bindings/js/JavaScriptProfileNode.h
U local/WebCore/bindings/js/JSWorkerContextCustom.cpp
U local/WebCore/bindings/js/JSDOMBinding.h
A local/WebCore/bindings/js/JavaScriptProfile.h
U local/WebCore/bindings/js/ScheduledAction.cpp
U local/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
U local/WebCore/bindings/js/JSDOMBinding.cpp
A local/WebCore/bindings/js/JavaScriptProfile.cpp
A local/WebCore/bindings/js/JavaScriptProfileNode.cpp
U local/WebCore/bindings/js/JSDOMWindowCustom.cpp
U local/WebCore/bindings/js/ScheduledAction.h
U local/WebCore/bindings/v8/V8DOMWrapper.cpp
U local/WebCore/bindings/v8/V8Proxy.h
U local/WebCore/bindings/v8/V8NPUtils.h
U local/WebCore/bindings/v8/V8DOMWindowShell.h
U local/WebCore/bindings/v8/V8Proxy.cpp
U local/WebCore/bindings/v8/V8DOMWrapper.h
U local/WebCore/bindings/v8/ScriptController.cpp
U local/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
U local/WebCore/bindings/v8/V8DOMWindowShell.cpp
U local/WebCore/bindings/v8/NPV8Object.cpp
U local/WebCore/bindings/v8/npruntime_priv.h
U local/WebCore/bindings/v8/V8Index.h
U local/WebCore/bindings/v8/DOMObjectsInclude.h
U local/WebCore/bindings/v8/V8Index.cpp
U local/WebCore/bindings/v8/NPV8Object.h
U local/WebCore/bindings/v8/V8NPObject.h
U local/WebCore/bindings/v8/npruntime_impl.h
U local/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp
U local/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
U local/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp
U local/WebCore/bindings/v8/custom/V8EventCustom.cpp
U local/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp
U local/WebCore/bindings/v8/custom/V8CustomVoidCallback.h
U local/WebCore/svg/SVGLength.cpp
U local/WebCore/svg/SVGForeignObjectElement.cpp
U local/WebCore/svg/graphics/SVGImage.cpp
U local/WebCore/svg/SVGSVGElement.cpp
U local/WebCore/html/HTMLMediaElement.cpp
U local/WebCore/html/HTMLInputElement.cpp
U local/WebCore/html/HTMLFormCollection.cpp
U local/WebCore/html/HTMLVideoElement.h
U local/WebCore/html/HTMLMediaElement.h
U local/WebCore/html/HTMLInputElement.h
U local/WebCore/html/HTMLTextAreaElement.h
U local/WebCore/html/HTMLFrameElementBase.h
U local/WebCore/html/HTMLFrameOwnerElement.h
U local/WebCore/html/HTMLAudioElement.h
U local/WebCore/html/HTMLTextAreaElement.cpp
U local/WebCore/html/HTMLFrameElementBase.cpp
U local/WebCore/html/ValidityState.cpp
U local/WebCore/html/HTMLPlugInElement.cpp
U local/WebCore/inspector/InspectorController.cpp
U local/WebCore/inspector/front-end/Section.js
A local/WebCore/inspector/front-end/popover.css
U local/WebCore/inspector/front-end/TextViewer.js
U local/WebCore/inspector/front-end/EventListenersSidebarPane.js
U local/WebCore/inspector/front-end/SourceFrame.js
U local/WebCore/inspector/front-end/SourceHTMLTokenizer.js
U local/WebCore/inspector/front-end/StylesSidebarPane.js
U local/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
U local/WebCore/inspector/front-end/textViewer.css
U local/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js
U local/WebCore/inspector/front-end/ResourcesPanel.js
U local/WebCore/inspector/front-end/ElementsTreeOutline.js
U local/WebCore/inspector/front-end/Settings.js
U local/WebCore/inspector/front-end/ObjectPropertiesSection.js
U local/WebCore/inspector/front-end/TextEditorHighlighter.js
U local/WebCore/inspector/front-end/inspector.css
A local/WebCore/inspector/front-end/Images/thumbHoverHoriz.png
A local/WebCore/inspector/front-end/Images/thumbHoverVert.png
A local/WebCore/inspector/front-end/Images/thumbActiveHoriz.png
A local/WebCore/inspector/front-end/Images/thumbActiveVert.png
A local/WebCore/inspector/front-end/Images/thumbVert.png
A local/WebCore/inspector/front-end/Images/gearButtonGlyph.png
A local/WebCore/inspector/front-end/Images/thumbHoriz.png
A local/WebCore/inspector/front-end/Images/trackVert.png
A local/WebCore/inspector/front-end/Images/trackHoriz.png
A local/WebCore/inspector/front-end/Images/popoverArrows.png
A local/WebCore/inspector/front-end/Images/popoverBackground.png
D local/WebCore/inspector/front-end/Popup.js
D local/WebCore/inspector/JavaScriptProfile.h
D local/WebCore/inspector/JavaScriptProfileNode.cpp
D local/WebCore/inspector/JavaScriptProfileNode.h
D local/WebCore/inspector/JavaScriptProfile.cpp
U local/WebCore/inspector/front-end/PropertiesSidebarPane.js
U local/WebCore/inspector/front-end/SourceTokenizer.js
U local/WebCore/inspector/front-end/inspector.html
U local/WebCore/inspector/front-end/DOMAgent.js
U local/WebCore/inspector/front-end/Panel.js
U local/WebCore/inspector/front-end/inspector.js
U local/WebCore/inspector/front-end/ObjectProxy.js
U local/WebCore/inspector/front-end/InjectedScript.js
U local/WebCore/inspector/front-end/utilities.js
U local/WebCore/inspector/front-end/inspectorSyntaxHighlight.css
U local/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
U local/WebCore/inspector/front-end/ElementsPanel.js
A local/WebCore/inspector/front-end/Popover.js
U local/WebCore/inspector/front-end/WebKit.qrc
U local/WebCore/websockets/WebSocketChannel.cpp
U local/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h
U local/WebCore/websockets/WebSocketChannelClient.h
U local/WebCore/websockets/WebSocketChannel.h
U local/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
U local/WebCore/websockets/WebSocket.cpp
U local/WebCore/websockets/WorkerThreadableWebSocketChannel.h
U local/WebCore/websockets/WebSocket.h
U local/WebCore/websockets/WebSocketHandshake.cpp
A local/WebCore/manual-tests/match-marker-rects.html
A local/WebCore/manual-tests/media-elements
A local/WebCore/manual-tests/media-elements/video-replaces-poster.html
U local/WebCore/rendering/RenderObject.cpp
U local/WebCore/rendering/RenderThemeMac.mm
U local/WebCore/rendering/RenderVideo.h
U local/WebCore/rendering/SVGRootInlineBox.cpp
U local/WebCore/rendering/RenderSVGBlock.h
U local/WebCore/rendering/RenderTableCell.cpp
U local/WebCore/rendering/RenderBox.h
U local/WebCore/rendering/RenderObject.h
U local/WebCore/rendering/RenderLayer.cpp
U local/WebCore/rendering/RenderForeignObject.cpp
U local/WebCore/rendering/RenderSlider.cpp
U local/WebCore/rendering/RenderRubyText.cpp
U local/WebCore/rendering/RenderTextControlSingleLine.h
U local/WebCore/rendering/RenderTextControlMultiLine.cpp
U local/WebCore/rendering/RenderRuby.cpp
U local/WebCore/rendering/RenderText.cpp
U local/WebCore/rendering/InlineTextBox.cpp
U local/WebCore/rendering/RenderTextControlSingleLine.cpp
U local/WebCore/rendering/RenderThemeChromiumMac.mm
U local/WebCore/rendering/RenderInline.cpp
U local/WebCore/rendering/RenderBox.cpp
U local/WebCore/rendering/RenderBlock.cpp
U local/WebCore/rendering/RenderLayerBacking.cpp
U local/WebCore/rendering/RenderInline.h
U local/WebCore/rendering/RenderFileUploadControl.cpp
U local/WebCore/rendering/RenderTextControl.cpp
U local/WebCore/rendering/RenderBlock.h
U local/WebCore/rendering/RenderRubyBase.cpp
U local/WebCore/rendering/RenderSVGRoot.h
U local/WebCore/rendering/RenderForeignObject.h
U local/WebCore/rendering/RenderSVGRoot.cpp
U local/WebCore/rendering/RenderRubyRun.cpp
U local/WebCore/rendering/RenderVideo.cpp
U local/WebCore/rendering/RenderSVGBlock.cpp
U local/WebCore/rendering/RenderTextControlMultiLine.h
U local/WebCore/rendering/style/RenderStyle.cpp
U local/WebCore/rendering/style/RenderStyleConstants.h
U local/WebCore/rendering/style/RenderStyle.h
U local/WebCore/rendering/RenderFileUploadControl.h
U local/WebCore/rendering/RenderTextControl.h
U local/WebCore/rendering/SVGCharacterLayoutInfo.h
U local/WebCore/rendering/RenderTableCell.h
U local/WebCore/English.lproj/localizedStrings.js
U local/WebCore/WebCore.xcodeproj/project.pbxproj
U local/WebCore/css/CSSStyleSelector.cpp
U local/WebCore/css/mediaControlsGtk.css
U local/WebCore/css/CSSStyleSelector.h
U local/WebCore/css/CSSParser.cpp
U local/WebCore/css/SVGCSSStyleSelector.cpp
U local/WebCore/bridge/jni/jsc/JavaStringJSC.h
U local/WebCore/bridge/NP_jsobject.cpp
U local/WebCore/bridge/qt/qt_pixmapruntime.cpp
U local/WebCore/bridge/qt/qt_runtime.cpp
U local/WebCore/bridge/runtime_root.h
U local/WebCore/bridge/runtime_root.cpp
D local/WebCore/ForwardingHeaders/wtf/PtrAndFlags.h
U local/WebCore/Android.v8bindings.mk
U local/WebCore/loader/FrameLoader.cpp
U local/WebCore/loader/EmptyClients.h
U local/WebCore/loader/HistoryController.cpp
U local/WebCore/loader/FrameLoaderClient.h
U local/WebCore/loader/ProgressTracker.cpp
U local/ChangeLog
C local/LayoutTests
U local/configure.ac
U local/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
U local/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
U local/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
U local/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
U local/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
U local/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
U local/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
U local/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
U local/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
U local/WebKitTools/DumpRenderTree/LayoutTestController.cpp
U local/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp
U local/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
U local/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
U local/WebKitTools/DumpRenderTree/LayoutTestController.h
U local/WebKitTools/Scripts/resolve-ChangeLogs
U local/WebKitTools/Scripts/build-webkit
A local/WebKitTools/Scripts/run-gtk-tests
A local/WebKitTools/Scripts/webkitperl/features.pm
C local/WebKitTools/Scripts/build-drawtest
C local/WebKitTools/Scripts/run-drawtest
U local/WebKitTools/Scripts/webkitdirs.pm
U local/WebKitTools/Scripts/check-webkit-style
U local/WebKitTools/Scripts/rebaseline-chromium-webkit-tests
U local/WebKitTools/Scripts/webkit-build-directory
U local/WebKitTools/Scripts/run-webkit-tests
U local/WebKitTools/Scripts/webkitpy/credentials.py
A local/WebKitTools/Scripts/webkitpy/grammar_unittest.py
U local/WebKitTools/Scripts/webkitpy/committers.py
U local/WebKitTools/Scripts/webkitpy/grammar.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/driver_test.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
A local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
A local/WebKitTools/Scripts/webkitpy/layout_tests/__init__.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py
U local/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
U local/WebKitTools/Scripts/webkitpy/bugzilla.py
U local/WebKitTools/Scripts/webkitpy/style/error_handlers_unittest.py
U local/WebKitTools/Scripts/webkitpy/style/error_handlers.py
U local/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py
U local/WebKitTools/Scripts/webkitpy/style/processors/cpp.py
U local/WebKitTools/Scripts/webkitpy/style/processors
U local/WebKitTools/Scripts/webkitpy/style/checker_unittest.py
U local/WebKitTools/Scripts/webkitpy/style/checker.py
U local/WebKitTools/Scripts/webkitpy/style/filter_unittest.py
U local/WebKitTools/Scripts/webkitpy/style/filter.py
U local/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
U local/WebKitTools/Scripts/webkitpy/commands/upload.py
A local/WebKitTools/Scripts/webkitpy/user_unittest.py
U local/WebKitTools/Scripts/webkitpy/user.py
U local/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
U local/WebKitTools/Scripts/run-webkit-websocketserver
U local/WebKitTools/Scripts/test-webkitpy
U local/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
U local/WebKitTools/ChangeLog
C local/WebKitTools/DrawTest/DrawTestDocument.h
C local/WebKitTools/DrawTest/DrawTest.xcodeproj/project.pbxproj
C local/WebKitTools/DrawTest/DrawTest_Prefix.pch
C local/WebKitTools/DrawTest/DrawTestView.m
C local/WebKitTools/DrawTest/DrawTestInspectorController.m
C local/WebKitTools/DrawTest/SVGTest.h
C local/WebKitTools/DrawTest/Info.plist
C local/WebKitTools/DrawTest/DrawTestDocument.m
C local/WebKitTools/DrawTest/SVGTest.m
C local/WebKitTools/DrawTest/TestViewerSplitView.h
C local/WebKitTools/DrawTest/AppDelegate.h
C local/WebKitTools/DrawTest/TestViewerSplitView.m
C local/WebKitTools/DrawTest/ScalingImageView.h
C local/WebKitTools/DrawTest/AppDelegate.m
C local/WebKitTools/DrawTest/ScalingImageView.m
C local/WebKitTools/DrawTest/TestController.h
C local/WebKitTools/DrawTest/DrawTestToolbarController.h
C local/WebKitTools/DrawTest/DrawTestView.h
C local/WebKitTools/DrawTest/DrawTestInspectorController.h
C local/WebKitTools/DrawTest/TestController.m
C local/WebKitTools/DrawTest/DrawTestToolbarController.m
C local/WebKitTools/DrawTest/main.m
D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/info.nib
D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/classes.nib
C local/WebKitTools/DrawTest/English.lproj/InfoPlist.strings
D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/keyedobjects.nib
D local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/info.nib
D local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/classes.nib
D local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/keyedobjects.nib
D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/info.nib
D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/classes.nib
D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/keyedobjects.nib
D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/info.nib
D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/classes.nib
D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/keyedobjects.nib
U local/WebKitTools/pywebsocket/setup.py
U local/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
U local/WebKitTools/QtLauncher/main.cpp
U local/WebKitTools/QtLauncher/webview.cpp
U local/WebKitTools/QtLauncher/mainwindow.cpp
U local/.gitattributes
C local/WebKitSite
U local/WebKit.pri
Summary of conflicts:
Text conflicts: 4
Tree conflicts: 27
--- Merging (from foreign repository) r54987 through r57734 into '.':
U JavaScriptCore/os-win32/stdint.h
D JavaScriptCore/wrec
D JavaScriptCore/create_rvct_stubs
U JavaScriptCore/profiler/Profile.cpp
U JavaScriptCore/profiler/CallIdentifier.h
U JavaScriptCore/profiler/ProfileNode.cpp
U JavaScriptCore/profiler/ProfileGenerator.cpp
U JavaScriptCore/GNUmakefile.am
U JavaScriptCore/runtime/RegExp.h
U JavaScriptCore/runtime/JSString.h
U JavaScriptCore/runtime/JSObject.h
U JavaScriptCore/runtime/CommonIdentifiers.cpp
U JavaScriptCore/runtime/NumericStrings.h
U JavaScriptCore/runtime/StringBuilder.h
U JavaScriptCore/runtime/InternalFunction.cpp
U JavaScriptCore/runtime/Identifier.cpp
U JavaScriptCore/runtime/JSGlobalObject.cpp
U JavaScriptCore/runtime/JSNumberCell.cpp
U JavaScriptCore/runtime/ExceptionHelpers.h
U JavaScriptCore/runtime/JSFunction.h
U JavaScriptCore/runtime/JSONObject.cpp
U JavaScriptCore/runtime/JSString.cpp
U JavaScriptCore/runtime/JSObject.cpp
U JavaScriptCore/runtime/JSArray.h
U JavaScriptCore/runtime/UStringImpl.h
U JavaScriptCore/runtime/CommonIdentifiers.h
U JavaScriptCore/runtime/PropertySlot.cpp
U JavaScriptCore/runtime/Identifier.h
U JavaScriptCore/runtime/ArrayPrototype.cpp
U JavaScriptCore/runtime/JSArray.cpp
U JavaScriptCore/runtime/Completion.h
U JavaScriptCore/runtime/Lookup.h
U JavaScriptCore/runtime/JSStringBuilder.h
U JavaScriptCore/runtime/JSCell.h
U JavaScriptCore/runtime/DateConversion.cpp
U JavaScriptCore/runtime/JSZombie.h
U JavaScriptCore/runtime/PropertySlot.h
U JavaScriptCore/runtime/JSActivation.cpp
U JavaScriptCore/runtime/Structure.cpp
U JavaScriptCore/runtime/RegExpMatchesArray.h
U JavaScriptCore/runtime/GetterSetter.h
U JavaScriptCore/runtime/JSNumberCell.h
U JavaScriptCore/runtime/JSTypeInfo.h
U JavaScriptCore/runtime/UString.h
U JavaScriptCore/runtime/JSActivation.h
U JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
A JavaScriptCore/runtime/Terminator.h
U JavaScriptCore/runtime/UString.cpp
U JavaScriptCore/runtime/JSGlobalData.h
U JavaScriptCore/runtime/NumberConstructor.cpp
U JavaScriptCore/runtime/RegExpConstructor.cpp
U JavaScriptCore/runtime/JSCell.cpp
U JavaScriptCore/runtime/MathObject.cpp
U JavaScriptCore/runtime/RegExpObject.cpp
U JavaScriptCore/runtime/ExceptionHelpers.cpp
U JavaScriptCore/runtime/Collector.cpp
U JavaScriptCore/runtime/JSGlobalData.cpp
U JavaScriptCore/runtime/JSGlobalObject.h
U JavaScriptCore/runtime/WeakGCPtr.h
U JavaScriptCore/runtime/JSImmediate.h
U JavaScriptCore/runtime/JSPropertyNameIterator.h
U JavaScriptCore/runtime/JSONObject.h
U JavaScriptCore/runtime/JSAPIValueWrapper.h
U JavaScriptCore/runtime/TimeoutChecker.cpp
U JavaScriptCore/runtime/UStringImpl.cpp
U JavaScriptCore/runtime/JSValue.h
U JavaScriptCore/runtime/PropertyNameArray.cpp
U JavaScriptCore/runtime/RegExp.cpp
U JavaScriptCore/runtime/Collector.h
U JavaScriptCore/runtime/Completion.cpp
U JavaScriptCore/runtime/FunctionPrototype.cpp
U JavaScriptCore/runtime/JSFunction.cpp
U JavaScriptCore/qt/tests/tests.pro
U JavaScriptCore/qt/tests/qscriptvalue/qscriptvalue.pro
U JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h
U JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp
U JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.cpp
U JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp
U JavaScriptCore/qt/tests/qscriptengine/qscriptengine.pro
U JavaScriptCore/qt/tests/tests.pri
A JavaScriptCore/qt/tests/qscriptstring
A JavaScriptCore/qt/tests/qscriptstring/tst_qscriptstring.cpp
A JavaScriptCore/qt/tests/qscriptstring/qscriptstring.pro
A JavaScriptCore/qt/api/qscriptsyntaxcheckresult.h
U JavaScriptCore/qt/api/qscriptengine_p.h
A JavaScriptCore/qt/api/qscriptstring_p.h
U JavaScriptCore/qt/api/qscriptconverter_p.h
A JavaScriptCore/qt/api/qscriptprogram_p.h
U JavaScriptCore/qt/api/qscriptvalue_p.h
U JavaScriptCore/qt/api/qscriptengine.cpp
A JavaScriptCore/qt/api/qscriptstring.cpp
A JavaScriptCore/qt/api/qscriptprogram.cpp
A JavaScriptCore/qt/api/qscriptsyntaxcheckresult_p.h
U JavaScriptCore/qt/api/qscriptengine.h
A JavaScriptCore/qt/api/qscriptstring.h
A JavaScriptCore/qt/api/qscriptprogram.h
U JavaScriptCore/qt/api/QtScript.pro
A JavaScriptCore/qt/api/qscriptsyntaxcheckresult.cpp
U JavaScriptCore/qt/api/qscriptengine_p.cpp
U JavaScriptCore/JavaScriptCore.gypi
A JavaScriptCore/create_jit_stubs
U JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
U JavaScriptCore/bytecompiler/NodesCodegen.cpp
U JavaScriptCore/wtf/ASCIICType.h
A JavaScriptCore/wtf/text
A JavaScriptCore/wtf/text/CString.h
A JavaScriptCore/wtf/text/CString.cpp
D JavaScriptCore/wtf/gtk/GRefPtr.h
D JavaScriptCore/wtf/gtk/GOwnPtr.cpp
D JavaScriptCore/wtf/gtk/GOwnPtr.h
D JavaScriptCore/wtf/gtk/GRefPtr.cpp
U JavaScriptCore/wtf/Threading.h
U JavaScriptCore/wtf/StdLibExtras.h
A JavaScriptCore/wtf/brew/SystemMallocBrew.h
A JavaScriptCore/wtf/brew/ShellBrew.h
D JavaScriptCore/wtf/brew/OwnPtrBrew.cpp
D JavaScriptCore/wtf/brew/OwnPtrBrew.h
U JavaScriptCore/wtf/mac/MainThreadMac.mm
U JavaScriptCore/wtf/HashCountedSet.h
U JavaScriptCore/wtf/FastMalloc.h
U JavaScriptCore/wtf/PassRefPtr.h
U JavaScriptCore/wtf/AlwaysInline.h
U JavaScriptCore/wtf/ValueCheck.h
U JavaScriptCore/wtf/FastMalloc.cpp
U JavaScriptCore/wtf/TCSystemAlloc.cpp
U JavaScriptCore/wtf/Platform.h
U JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
U JavaScriptCore/wtf/unicode/Collator.h
U JavaScriptCore/wtf/unicode/CollatorDefault.cpp
U JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h
U JavaScriptCore/wtf/Vector.h
A JavaScriptCore/wtf/gobject
A JavaScriptCore/wtf/gobject/GRefPtr.h
A JavaScriptCore/wtf/gobject/GOwnPtr.cpp
A JavaScriptCore/wtf/gobject/GOwnPtr.h
A JavaScriptCore/wtf/gobject/GRefPtr.cpp
U JavaScriptCore/wtf/OwnPtr.h
U JavaScriptCore/wtf/VectorTraits.h
U JavaScriptCore/wtf/Assertions.h
U JavaScriptCore/wtf/OwnFastMallocPtr.h
U JavaScriptCore/wtf/VMTags.h
U JavaScriptCore/wtf/OwnPtrCommon.h
A JavaScriptCore/wtf/OwnPtrBrew.cpp
A JavaScriptCore/wtf/symbian
A JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp
A JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h
U JavaScriptCore/wtf/MathExtras.h
U JavaScriptCore/wtf/HashMap.h
U JavaScriptCore/jsc.cpp
U JavaScriptCore/interpreter/Interpreter.cpp
U JavaScriptCore/API/JSCallbackFunction.cpp
A JavaScriptCore/API/JSObjectRefPrivate.h
A JavaScriptCore/API/JSWeakObjectMapRefPrivate.h
A JavaScriptCore/API/JSWeakObjectMapRefInternal.h
U JavaScriptCore/API/JSValueRef.h
U JavaScriptCore/API/JSCallbackObjectFunctions.h
U JavaScriptCore/API/tests/testapi.c
U JavaScriptCore/API/JSCallbackObject.h
U JavaScriptCore/API/JSClassRef.cpp
U JavaScriptCore/API/JSObjectRef.cpp
A JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
U JavaScriptCore/API/JSValueRef.cpp
U JavaScriptCore/API/JSContextRef.cpp
U JavaScriptCore/API/WebKitAvailability.h
U JavaScriptCore/API/APICast.h
U JavaScriptCore/yarr/RegexInterpreter.cpp
U JavaScriptCore/yarr/RegexJIT.cpp
U JavaScriptCore/yarr/RegexInterpreter.h
U JavaScriptCore/yarr/RegexCompiler.cpp
U JavaScriptCore/yarr/RegexJIT.h
U JavaScriptCore/yarr/RegexCompiler.h
U JavaScriptCore/yarr/RegexParser.h
U JavaScriptCore/yarr/RegexPattern.h
U JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
U JavaScriptCore/assembler/ARMv7Assembler.h
U JavaScriptCore/assembler/MacroAssembler.h
U JavaScriptCore/assembler/MacroAssemblerARM.h
U JavaScriptCore/assembler/CodeLocation.h
U JavaScriptCore/assembler/MacroAssemblerX86.h
A JavaScriptCore/assembler/MIPSAssembler.h
U JavaScriptCore/assembler/AssemblerBuffer.h
U JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h
U JavaScriptCore/assembler/ARMAssembler.cpp
U JavaScriptCore/assembler/MacroAssemblerARMv7.h
U JavaScriptCore/assembler/ARMAssembler.h
U JavaScriptCore/assembler/MacroAssemblerX86_64.h
U JavaScriptCore/assembler/MacroAssemblerX86Common.h
U JavaScriptCore/assembler/RepatchBuffer.h
U JavaScriptCore/assembler/AbstractMacroAssembler.h
U JavaScriptCore/assembler/X86Assembler.h
U JavaScriptCore/assembler/MacroAssemblerCodeRef.h
U JavaScriptCore/assembler/LinkBuffer.h
A JavaScriptCore/assembler/MacroAssemblerMIPS.h
U JavaScriptCore/jsc.pro
U JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
U JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
U JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
U JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
U JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
U JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
U JavaScriptCore/DerivedSources.pro
U JavaScriptCore/Android.mk
U JavaScriptCore/jit/JITArithmetic.cpp
U JavaScriptCore/jit/JITOpcodes.cpp
U JavaScriptCore/jit/JITStubs.cpp
U JavaScriptCore/jit/JITStubs.h
U JavaScriptCore/jit/JITPropertyAccess.cpp
U JavaScriptCore/jit/JITInlineMethods.h
U JavaScriptCore/jit/JITCall.cpp
U JavaScriptCore/jit/JIT.cpp
U JavaScriptCore/jit/JITCode.h
U JavaScriptCore/jit/ExecutableAllocator.h
A JavaScriptCore/jit/JITPropertyAccess32_64.cpp
U JavaScriptCore/jit/JIT.h
U JavaScriptCore/ChangeLog
U JavaScriptCore/pcre/pcre_exec.cpp
U JavaScriptCore/Configurations/Version.xcconfig
U JavaScriptCore/Configurations/DebugRelease.xcconfig
U JavaScriptCore/Configurations/FeatureDefines.xcconfig
U JavaScriptCore/Configurations/Base.xcconfig
U JavaScriptCore/Configurations/JavaScriptCore.xcconfig
U JavaScriptCore/wscript
U JavaScriptCore/parser/NodeConstructors.h
U JavaScriptCore/parser/Grammar.y
U JavaScriptCore/parser/Parser.cpp
U JavaScriptCore/parser/Nodes.h
U JavaScriptCore/bytecode/Opcode.h
U JavaScriptCore/bytecode/CodeBlock.cpp
U JavaScriptCore/bytecode/Instruction.h
U JavaScriptCore/bytecode/CodeBlock.h
U JavaScriptCore/JavaScriptCore.pri
U JavaScriptCore/JavaScriptCore.exp
U JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
U JavaScriptCore/create_hash_table
U JavaScriptCore/JavaScriptCore.pro
C WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
U WebKitLibraries/WebKitSystemInterface.h
C WebKitLibraries/libWebCoreSQLite3.a
U WebKitLibraries/ChangeLog
C WebKitLibraries/libWebKitSystemInterfaceLeopard.a
U WebKitLibraries/WebCoreSQLite3/sqlite3.h
U WebKitLibraries/WebCoreSQLite3/sqlite3ext.h
C WebKitLibraries/libWebKitSystemInterfaceTiger.a
U WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
U WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
U WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
D WebKitLibraries/win/include/QuartzCoreInterface
U WebKitLibraries/win/lib/WebKitSystemInterface.lib
U WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
C WebKitLibraries/win/lib/QuartzCoreInterface.lib
C WebKitLibraries/win/bin/QuartzCoreInterface.dll
U GNUmakefile.am
U JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
U JavaScriptGlue/ChangeLog
U JavaScriptGlue/Configurations/Version.xcconfig
U JavaScriptGlue/Configurations/DebugRelease.xcconfig
U JavaScriptGlue/Configurations/Base.xcconfig
U JavaScriptGlue/UserObjectImp.cpp
A JavaScriptGlue/ForwardingHeaders/wtf/text
A JavaScriptGlue/ForwardingHeaders/wtf/text/CString.h
U JavaScriptGlue/UserObjectImp.h
U WebKit.pro
U WebKit/WebKit.xcodeproj/project.pbxproj
A WebKit/chromium/WebKit.grd
A WebKit/chromium/tests/PopupMenuTest.cpp
U WebKit/chromium/tests/KURLTest.cpp
U WebKit/chromium/WebKit.gyp
U WebKit/chromium/gyp_webkit
U WebKit/chromium/features.gypi
U WebKit/chromium/ChangeLog
U WebKit/chromium/src/WebDevToolsAgentImpl.cpp
U WebKit/chromium/src/WebViewImpl.h
U WebKit/chromium/src/WebString.cpp
U WebKit/chromium/src/NotificationPresenterImpl.h
A WebKit/chromium/src/WebImageDecoder.cpp
U WebKit/chromium/src/FrameLoaderClientImpl.h
U WebKit/chromium/src/WebSecurityOrigin.cpp
U WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
U WebKit/chromium/src/WebSettingsImpl.cpp
A WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
U WebKit/chromium/src/WebSecurityPolicy.cpp
A WebKit/chromium/src/InspectorFrontendClientImpl.cpp
A WebKit/chromium/src/js/DebuggerScript.js
A WebKit/chromium/src/js/Images/segmentHoverChromium2.png
A WebKit/chromium/src/js/Images/statusbarBackgroundChromium2.png
A WebKit/chromium/src/js/Images/statusbarMenuButtonChromium2.png
A WebKit/chromium/src/js/Images/segmentSelectedChromium2.png
A WebKit/chromium/src/js/Images/segmentChromium2.png
D WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
U WebKit/chromium/src/js/DevToolsHostStub.js
U WebKit/chromium/src/js/InjectDispatch.js
U WebKit/chromium/src/js/InspectorControllerImpl.js
U WebKit/chromium/src/js/DevTools.js
U WebKit/chromium/src/js/HeapProfilerPanel.js
U WebKit/chromium/src/js/ProfilerAgent.js
U WebKit/chromium/src/js/Tests.js
U WebKit/chromium/src/js/DebuggerAgent.js
U WebKit/chromium/src/WebBindings.cpp
U WebKit/chromium/src/InspectorClientImpl.h
U WebKit/chromium/src/ChromeClientImpl.cpp
U WebKit/chromium/src/ChromiumBridge.cpp
U WebKit/chromium/src/WebDatabase.cpp
U WebKit/chromium/src/WebDevToolsAgentImpl.h
A WebKit/chromium/src/WebSerializedScriptValue.cpp
U WebKit/chromium/src/EditorClientImpl.h
A WebKit/chromium/src/IndexedDatabaseProxy.h
U WebKit/chromium/src/WebPluginContainerImpl.cpp
U WebKit/chromium/src/WebStorageAreaImpl.h
A WebKit/chromium/src/WebGeolocationServiceBridgeImpl.h
U WebKit/chromium/src/InspectorClientImpl.cpp
A WebKit/chromium/src/WebIndexedDatabaseImpl.h
A WebKit/chromium/src/IDBDatabaseProxy.h
U WebKit/chromium/src/WebHTTPBody.cpp
U WebKit/chromium/src/AutoFillPopupMenuClient.h
U WebKit/chromium/src/StorageAreaProxy.cpp
U WebKit/chromium/src/SharedWorkerRepository.cpp
U WebKit/chromium/src/WebWorkerBase.cpp
U WebKit/chromium/src/ChromeClientImpl.h
U WebKit/chromium/src/WebDragData.cpp
U WebKit/chromium/src/WebInputEventConversion.cpp
A WebKit/chromium/src/IndexedDatabaseProxy.cpp
U WebKit/chromium/src/EditorClientImpl.cpp
U WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
U WebKit/chromium/src/WebPopupMenuImpl.h