WebKit merge 48610:48642

webkit/tools/layout_tests/test_expectations.txt

Index: webkit/tools/layout_tests/test_expectations.txt
===================================================================
--- webkit/tools/layout_tests/test_expectations.txt	(revision 26841)
+++ webkit/tools/layout_tests/test_expectations.txt	(working copy)
@@ -1354,7 +1354,7 @@
 BUG10667 MAC : chrome/plugins/refcount-leaks.html = FAIL
 BUG10667 MAC : chrome/plugins/return-npobject.html = FAIL
 BUG10667 MAC : chrome/plugins/script-object-invoke.html = FAIL
-BUG10667 MAC : pending/plugins/iframe-shims.html = FAIL
+BUG10667 MAC : LayoutTests/plugins/iframe-shims.html = FAIL
 
 // NEW FOR MERGE 36102:37604
 
@@ -2282,7 +2282,6 @@
 
 // New test added in r48336 (V8 bug)
 BUG21767 : LayoutTests/fast/js/Object-keys.html = FAIL
-BUG21767 : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TIMEOUT
 
 // WK roll to 48371
 BUG21841 MAC : LayoutTests/plugins/destroy-during-npp-new.html = FAIL
@@ -2335,3 +2334,8 @@
 
 // WebKit merge 48500:48585, due to newly added support for MathML.
 BUG22554 SKIP : LayoutTests/mathml = FAIL
+
+// WebKit merge 48610:48642
+BUG_PAUL : LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html = TIMEOUT
+BUG_PAUL LINUX : LayoutTests/editing/selection/click-outside-editable-div.html = FAIL
+BUG_PAUL LINUX : LayoutTests/fast/events/frame-tab-focus.html = FAIL