| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "core/events/KeyboardEvent.h" | 43 #include "core/events/KeyboardEvent.h" |
| 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/loader/FormState.h" | 54 #include "core/loader/FormState.h" |
| 54 #include "core/loader/FrameLoadRequest.h" | 55 #include "core/loader/FrameLoadRequest.h" |
| 55 #include "core/page/Chrome.h" | 56 #include "core/page/Chrome.h" |
| 56 #include "core/page/EventHandler.h" | 57 #include "core/page/EventHandler.h" |
| 57 #include "core/page/FocusController.h" | 58 #include "core/page/FocusController.h" |
| 58 #include "core/page/Page.h" | 59 #include "core/page/Page.h" |
| 59 #include "core/page/scrolling/ScrollingCoordinator.h" | 60 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 60 #include "core/plugins/PluginOcclusionSupport.h" | 61 #include "core/plugins/PluginOcclusionSupport.h" |
| 61 #include "core/rendering/RenderBox.h" | 62 #include "core/rendering/RenderBox.h" |
| 62 #include "core/rendering/RenderLayer.h" | |
| 63 #include "core/rendering/RenderPart.h" | 63 #include "core/rendering/RenderPart.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" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 return; | 137 return; |
| 138 | 138 |
| 139 RenderBox* renderer = toRenderBox(m_element->renderer()); | 139 RenderBox* renderer = toRenderBox(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 RenderLayer::compositingState(). | 147 // For querying Layer::compositingState(). |
| 148 // This code should be correct. | 148 // This code should be correct. |
| 149 DisableCompositingQueryAsserts disabler; | 149 DisableCompositingQueryAsserts disabler; |
| 150 renderer->invalidatePaintRectangle(dirtyRect); | 150 renderer->invalidatePaintRectangle(dirtyRect); |
| 151 } | 151 } |
| 152 | 152 |
| 153 void WebPluginContainerImpl::setFocus(bool focused, WebFocusType focusType) | 153 void WebPluginContainerImpl::setFocus(bool focused, WebFocusType focusType) |
| 154 { | 154 { |
| 155 Widget::setFocus(focused, focusType); | 155 Widget::setFocus(focused, focusType); |
| 156 m_webPlugin->updateFocus(focused, focusType); | 156 m_webPlugin->updateFocus(focused, focusType); |
| 157 } | 157 } |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 if (!needsCompositingUpdate) | 301 if (!needsCompositingUpdate) |
| 302 return; | 302 return; |
| 303 | 303 |
| 304 #if ENABLE(OILPAN) | 304 #if ENABLE(OILPAN) |
| 305 if (!m_element) | 305 if (!m_element) |
| 306 return; | 306 return; |
| 307 #endif | 307 #endif |
| 308 | 308 |
| 309 m_element->setNeedsCompositingUpdate(); | 309 m_element->setNeedsCompositingUpdate(); |
| 310 // Being composited or not affects the self painting layer bit | 310 // Being composited or not affects the self painting layer bit |
| 311 // on the RenderLayer. | 311 // on the Layer. |
| 312 if (RenderPart* renderer = m_element->renderPart()) { | 312 if (RenderPart* renderer = m_element->renderPart()) { |
| 313 ASSERT(renderer->hasLayer()); | 313 ASSERT(renderer->hasLayer()); |
| 314 renderer->layer()->updateSelfPaintingLayer(); | 314 renderer->layer()->updateSelfPaintingLayer(); |
| 315 } | 315 } |
| 316 } | 316 } |
| 317 | 317 |
| 318 bool WebPluginContainerImpl::supportsPaginatedPrint() const | 318 bool WebPluginContainerImpl::supportsPaginatedPrint() const |
| 319 { | 319 { |
| 320 return m_webPlugin->supportsPaginatedPrint(); | 320 return m_webPlugin->supportsPaginatedPrint(); |
| 321 } | 321 } |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 982 | 982 |
| 983 return clipRect; | 983 return clipRect; |
| 984 } | 984 } |
| 985 | 985 |
| 986 bool WebPluginContainerImpl::pluginShouldPersist() const | 986 bool WebPluginContainerImpl::pluginShouldPersist() const |
| 987 { | 987 { |
| 988 return m_webPlugin->shouldPersist(); | 988 return m_webPlugin->shouldPersist(); |
| 989 } | 989 } |
| 990 | 990 |
| 991 } // namespace blink | 991 } // namespace blink |
| OLD | NEW |