| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if (!preferredLogicalWidthsDirty()) | 93 if (!preferredLogicalWidthsDirty()) |
| 94 setPreferredLogicalWidthsDirty(); | 94 setPreferredLogicalWidthsDirty(); |
| 95 | 95 |
| 96 LayoutSize oldSize = size(); | 96 LayoutSize oldSize = size(); |
| 97 updateLogicalWidth(); | 97 updateLogicalWidth(); |
| 98 updateLogicalHeight(); | 98 updateLogicalHeight(); |
| 99 if (oldSize == size()) | 99 if (oldSize == size()) |
| 100 return; | 100 return; |
| 101 | 101 |
| 102 if (!selfNeedsLayout()) | 102 if (!selfNeedsLayout()) |
| 103 setNeedsLayoutAndFullRepaint(); | 103 setNeedsLayoutAndFullPaintInvalidation(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons(CompositingTri
ggerFlags triggers) const | 106 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons(CompositingTri
ggerFlags triggers) const |
| 107 { | 107 { |
| 108 if (!(triggers & CanvasTrigger)) | 108 if (!(triggers & CanvasTrigger)) |
| 109 return CompositingReasonNone; | 109 return CompositingReasonNone; |
| 110 | 110 |
| 111 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); | 111 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); |
| 112 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) | 112 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) |
| 113 return CompositingReasonCanvas; | 113 return CompositingReasonCanvas; |
| 114 | 114 |
| 115 return CompositingReasonNone; | 115 return CompositingReasonNone; |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace WebCore | 118 } // namespace WebCore |
| OLD | NEW |