OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" | 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1017 uint32 flags = RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_FRAME; | 1017 uint32 flags = RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_FRAME; |
1018 | 1018 |
1019 // If a plugin (like Google Earth or Java) has child windows that are hosted | 1019 // If a plugin (like Google Earth or Java) has child windows that are hosted |
1020 // in a different process, then RedrawWindow with UPDATENOW will | 1020 // in a different process, then RedrawWindow with UPDATENOW will |
1021 // synchronously wait for this call to complete. Some messages are pumped | 1021 // synchronously wait for this call to complete. Some messages are pumped |
1022 // but not others, which could lead to a deadlock. So avoid reentrancy by | 1022 // but not others, which could lead to a deadlock. So avoid reentrancy by |
1023 // only synchronously calling RedrawWindow once at a time. | 1023 // only synchronously calling RedrawWindow once at a time. |
1024 if (old_message != custom_msg) | 1024 if (old_message != custom_msg) |
1025 flags |= RDW_UPDATENOW; | 1025 flags |= RDW_UPDATENOW; |
1026 | 1026 |
1027 RedrawWindow(hwnd, &invalid_rect.ToRECT(), NULL, flags); | 1027 RECT rect = invalid_rect.ToRECT(); |
| 1028 RedrawWindow(hwnd, &rect, NULL, flags); |
1028 result = FALSE; | 1029 result = FALSE; |
1029 } else { | 1030 } else { |
1030 delegate->is_calling_wndproc = true; | 1031 delegate->is_calling_wndproc = true; |
1031 | 1032 |
1032 if (!delegate->user_gesture_message_posted_ && | 1033 if (!delegate->user_gesture_message_posted_ && |
1033 IsUserGestureMessage(message)) { | 1034 IsUserGestureMessage(message)) { |
1034 delegate->user_gesture_message_posted_ = true; | 1035 delegate->user_gesture_message_posted_ = true; |
1035 | 1036 |
1036 delegate->instance()->PushPopupsEnabledState(true); | 1037 delegate->instance()->PushPopupsEnabledState(true); |
1037 | 1038 |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1536 ::ReleaseCapture(); | 1537 ::ReleaseCapture(); |
1537 break; | 1538 break; |
1538 | 1539 |
1539 default: | 1540 default: |
1540 break; | 1541 break; |
1541 } | 1542 } |
1542 } | 1543 } |
1543 | 1544 |
1544 } // namespace npapi | 1545 } // namespace npapi |
1545 } // namespace webkit | 1546 } // namespace webkit |
OLD | NEW |