summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 15:26:59 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 15:26:59 +0000
commit2014cdc6254263ae5d79c567d020551e38e2f203 (patch)
treebe3149aa8a0e026b56ed7f2a186c6b5af06d3fba
parentf2d4a585db73673024c6022580747bc8c3d0ba48 (diff)
downloadchromium_src-2014cdc6254263ae5d79c567d020551e38e2f203.zip
chromium_src-2014cdc6254263ae5d79c567d020551e38e2f203.tar.gz
chromium_src-2014cdc6254263ae5d79c567d020551e38e2f203.tar.bz2
Fix non-initialized pointer issue in test_shell for Mac.
BUG=10667 TEST=none Review URL: http://codereview.chromium.org/465052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33962 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl_mac.mm1
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index cc37852..b00032e 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -85,6 +85,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
last_mouse_x_(0),
last_mouse_y_(0),
have_focus_(false),
+ focus_notifier_(NULL),
handle_event_depth_(0),
user_gesture_message_posted_(this),
user_gesture_msg_factory_(this) {
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index acd3e9b..ccab51b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1400,13 +1400,13 @@ BUG10351 MAC : LayoutTests/fast/dom/object-embed-plugin-scripting.html = PASS FA
BUG10351 SKIP MAC : LayoutTests/http/tests/plugins/geturlnotify-from-npp-destroystream.html = FAIL
BUG10351 MAC : LayoutTests/plugins/inner-html-display-none.html = FAIL
BUG10351 MAC DEBUG : LayoutTests/plugins/invoke.html = PASS FAIL
-BUG10351 MAC : LayoutTests/plugins/mouse-events.html = CRASH FAIL
+BUG10351 MAC : LayoutTests/plugins/mouse-events.html = FAIL
BUG10351 MAC DEBUG : LayoutTests/http/tests/plugins/npapi-response-headers.html = PASS FAIL
// Skip because we throw an exception before we get to dumpAsText.
BUG10667 SKIP MAC : chrome/plugins/get-url-with-blank-target.html = FAIL
BUG10667 SLOW MAC DEBUG : chrome/plugins/multiple-plugins.html = FAIL PASS
BUG10667 MAC : chrome/plugins/return-npobject.html = FAIL
-BUG10667 MAC : LayoutTests/plugins/iframe-shims.html = CRASH FAIL
+BUG10667 MAC : LayoutTests/plugins/iframe-shims.html = FAIL
// BUG10667 SLOW MAC RELEASE : LayoutTests/plugins/iframe-shims.html = FAIL
// NEW FOR MERGE 36102:37604