| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "WebCompositionUnderline.h" | 34 #include "WebCompositionUnderline.h" |
| 35 #include "WebTextInputType.h" | 35 #include "WebTextInputType.h" |
| 36 #include "WebTextDirection.h" | 36 #include "WebTextDirection.h" |
| 37 #include "platform/WebCanvas.h" | 37 #include "platform/WebCanvas.h" |
| 38 #include "platform/WebCommon.h" | 38 #include "platform/WebCommon.h" |
| 39 #include "platform/WebRect.h" | 39 #include "platform/WebRect.h" |
| 40 #include "platform/WebSize.h" | 40 #include "platform/WebSize.h" |
| 41 | 41 |
| 42 #define WEBKIT_HAS_NEW_FULLSCREEN_API 1 | 42 #define WEBKIT_HAS_NEW_FULLSCREEN_API 1 |
| 43 #define WEBWIDGET_HAS_SETCOMPOSITORSURFACEREADY 1 |
| 43 | 44 |
| 44 namespace WebKit { | 45 namespace WebKit { |
| 45 | 46 |
| 46 class WebInputEvent; | 47 class WebInputEvent; |
| 47 class WebMouseEvent; | 48 class WebMouseEvent; |
| 48 class WebString; | 49 class WebString; |
| 49 struct WebPoint; | 50 struct WebPoint; |
| 50 template <typename T> class WebVector; | 51 template <typename T> class WebVector; |
| 51 | 52 |
| 52 class WebWidget { | 53 class WebWidget { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 // In non-threaded compositing mode, triggers compositing of the current | 101 // In non-threaded compositing mode, triggers compositing of the current |
| 101 // layers onto the screen. You MUST call Layout before calling this method, | 102 // layers onto the screen. You MUST call Layout before calling this method, |
| 102 // for the same reasons described in the paint method above | 103 // for the same reasons described in the paint method above |
| 103 // | 104 // |
| 104 // In threaded compositing mode, indicates that the widget should update | 105 // In threaded compositing mode, indicates that the widget should update |
| 105 // itself, for example due to window damage. The redraw will begin | 106 // itself, for example due to window damage. The redraw will begin |
| 106 // asynchronously and perform layout and animation internally. Do not call | 107 // asynchronously and perform layout and animation internally. Do not call |
| 107 // animate or layout in this case. | 108 // animate or layout in this case. |
| 108 virtual void composite(bool finish) = 0; | 109 virtual void composite(bool finish) = 0; |
| 109 | 110 |
| 111 // Indicates that the compositing surface associated with this WebWidget is |
| 112 // ready to use. |
| 113 virtual void setCompositorSurfaceReady() = 0; |
| 114 |
| 110 // Temporary method for the embedder to notify the WebWidget that the widget | 115 // Temporary method for the embedder to notify the WebWidget that the widget |
| 111 // has taken damage, e.g. due to a window expose. This method will be | 116 // has taken damage, e.g. due to a window expose. This method will be |
| 112 // removed when the WebWidget inversion patch lands --- http://crbug.com/112
837 | 117 // removed when the WebWidget inversion patch lands --- http://crbug.com/112
837 |
| 113 virtual void setNeedsRedraw() { } | 118 virtual void setNeedsRedraw() { } |
| 114 | 119 |
| 115 // Temporary method for the embedder to check for throttled input. When this | 120 // Temporary method for the embedder to check for throttled input. When this |
| 116 // is true, the WebWidget is indicating that it would prefer to not receive | 121 // is true, the WebWidget is indicating that it would prefer to not receive |
| 117 // additional input events until | 122 // additional input events until |
| 118 // WebWidgetClient::didBecomeReadyForAdditionalInput is called. | 123 // WebWidgetClient::didBecomeReadyForAdditionalInput is called. |
| 119 // | 124 // |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 // following the call to instrumentBeginFrame(). | 213 // following the call to instrumentBeginFrame(). |
| 209 virtual void instrumentCancelFrame() { } | 214 virtual void instrumentCancelFrame() { } |
| 210 | 215 |
| 211 protected: | 216 protected: |
| 212 ~WebWidget() { } | 217 ~WebWidget() { } |
| 213 }; | 218 }; |
| 214 | 219 |
| 215 } // namespace WebKit | 220 } // namespace WebKit |
| 216 | 221 |
| 217 #endif | 222 #endif |
| OLD | NEW |