| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "core/events/MouseEvent.h" | 44 #include "core/events/MouseEvent.h" |
| 45 #include "core/events/TouchEvent.h" | 45 #include "core/events/TouchEvent.h" |
| 46 #include "core/events/WheelEvent.h" | 46 #include "core/events/WheelEvent.h" |
| 47 #include "core/frame/EventHandlerRegistry.h" | 47 #include "core/frame/EventHandlerRegistry.h" |
| 48 #include "core/frame/FrameView.h" | 48 #include "core/frame/FrameView.h" |
| 49 #include "core/frame/LocalFrame.h" | 49 #include "core/frame/LocalFrame.h" |
| 50 #include "core/html/HTMLFormElement.h" | 50 #include "core/html/HTMLFormElement.h" |
| 51 #include "core/html/HTMLPlugInElement.h" | 51 #include "core/html/HTMLPlugInElement.h" |
| 52 #include "core/layout/HitTestResult.h" | 52 #include "core/layout/HitTestResult.h" |
| 53 #include "core/layout/Layer.h" | 53 #include "core/layout/Layer.h" |
| 54 #include "core/layout/LayoutBox.h" |
| 54 #include "core/layout/LayoutPart.h" | 55 #include "core/layout/LayoutPart.h" |
| 55 #include "core/loader/FormState.h" | 56 #include "core/loader/FormState.h" |
| 56 #include "core/loader/FrameLoadRequest.h" | 57 #include "core/loader/FrameLoadRequest.h" |
| 57 #include "core/page/Chrome.h" | 58 #include "core/page/Chrome.h" |
| 58 #include "core/page/EventHandler.h" | 59 #include "core/page/EventHandler.h" |
| 59 #include "core/page/FocusController.h" | 60 #include "core/page/FocusController.h" |
| 60 #include "core/page/Page.h" | 61 #include "core/page/Page.h" |
| 61 #include "core/page/scrolling/ScrollingCoordinator.h" | 62 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 62 #include "core/plugins/PluginOcclusionSupport.h" | 63 #include "core/plugins/PluginOcclusionSupport.h" |
| 63 #include "core/rendering/RenderBox.h" | |
| 64 #include "platform/HostWindow.h" | 64 #include "platform/HostWindow.h" |
| 65 #include "platform/KeyboardCodes.h" | 65 #include "platform/KeyboardCodes.h" |
| 66 #include "platform/PlatformGestureEvent.h" | 66 #include "platform/PlatformGestureEvent.h" |
| 67 #include "platform/UserGestureIndicator.h" | 67 #include "platform/UserGestureIndicator.h" |
| 68 #include "platform/exported/WrappedResourceResponse.h" | 68 #include "platform/exported/WrappedResourceResponse.h" |
| 69 #include "platform/graphics/GraphicsContext.h" | 69 #include "platform/graphics/GraphicsContext.h" |
| 70 #include "platform/graphics/GraphicsLayer.h" | 70 #include "platform/graphics/GraphicsLayer.h" |
| 71 #include "platform/scroll/ScrollAnimator.h" | 71 #include "platform/scroll/ScrollAnimator.h" |
| 72 #include "platform/scroll/ScrollbarTheme.h" | 72 #include "platform/scroll/ScrollbarTheme.h" |
| 73 #include "public/platform/Platform.h" | 73 #include "public/platform/Platform.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 m_webPlugin->paint(canvas, windowRect); | 129 m_webPlugin->paint(canvas, windowRect); |
| 130 | 130 |
| 131 gc->restore(); | 131 gc->restore(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void WebPluginContainerImpl::invalidateRect(const IntRect& rect) | 134 void WebPluginContainerImpl::invalidateRect(const IntRect& rect) |
| 135 { | 135 { |
| 136 if (!parent()) | 136 if (!parent()) |
| 137 return; | 137 return; |
| 138 | 138 |
| 139 RenderBox* renderer = toRenderBox(m_element->renderer()); | 139 LayoutBox* renderer = toLayoutBox(m_element->renderer()); |
| 140 if (!renderer) | 140 if (!renderer) |
| 141 return; | 141 return; |
| 142 | 142 |
| 143 IntRect dirtyRect = rect; | 143 IntRect dirtyRect = rect; |
| 144 dirtyRect.move(renderer->borderLeft() + renderer->paddingLeft(), | 144 dirtyRect.move(renderer->borderLeft() + renderer->paddingLeft(), |
| 145 renderer->borderTop() + renderer->paddingTop()); | 145 renderer->borderTop() + renderer->paddingTop()); |
| 146 | 146 |
| 147 // For querying Layer::compositingState(). | 147 // For querying Layer::compositingState(). |
| 148 // This code should be correct. | 148 // This code should be correct. |
| 149 DisableCompositingQueryAsserts disabler; | 149 DisableCompositingQueryAsserts disabler; |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 994 | 994 |
| 995 return clipRect; | 995 return clipRect; |
| 996 } | 996 } |
| 997 | 997 |
| 998 bool WebPluginContainerImpl::pluginShouldPersist() const | 998 bool WebPluginContainerImpl::pluginShouldPersist() const |
| 999 { | 999 { |
| 1000 return m_webPlugin->shouldPersist(); | 1000 return m_webPlugin->shouldPersist(); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 } // namespace blink | 1003 } // namespace blink |
| OLD | NEW |