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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 LayoutSize oldSize = size(); | 104 LayoutSize oldSize = size(); |
105 updateLogicalWidth(); | 105 updateLogicalWidth(); |
106 updateLogicalHeight(); | 106 updateLogicalHeight(); |
107 if (oldSize == size()) | 107 if (oldSize == size()) |
108 return; | 108 return; |
109 | 109 |
110 if (!selfNeedsLayout()) | 110 if (!selfNeedsLayout()) |
111 setNeedsLayoutAndFullPaintInvalidation(); | 111 setNeedsLayoutAndFullPaintInvalidation(); |
112 } | 112 } |
113 | 113 |
114 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons(CompositingTri
ggerFlags triggers) const | 114 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons() const |
115 { | 115 { |
116 if (!(triggers & CanvasTrigger)) | |
117 return CompositingReasonNone; | |
118 | |
119 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); | 116 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); |
120 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) | 117 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) |
121 return CompositingReasonCanvas; | 118 return CompositingReasonCanvas; |
122 | 119 |
123 return CompositingReasonNone; | 120 return CompositingReasonNone; |
124 } | 121 } |
125 | 122 |
126 } // namespace blink | 123 } // namespace blink |
OLD | NEW |