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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 return; | 64 return; |
65 | 65 |
66 setIntrinsicSize(zoomedSize); | 66 setIntrinsicSize(zoomedSize); |
67 | 67 |
68 if (!parent()) | 68 if (!parent()) |
69 return; | 69 return; |
70 | 70 |
71 if (!preferredLogicalWidthsDirty()) | 71 if (!preferredLogicalWidthsDirty()) |
72 setPreferredLogicalWidthsDirty(); | 72 setPreferredLogicalWidthsDirty(); |
73 | 73 |
| 74 if (selfNeedsLayout()) |
| 75 return; |
| 76 |
74 LayoutSize oldSize = size(); | 77 LayoutSize oldSize = size(); |
75 updateLogicalWidth(); | 78 updateLogicalWidth(); |
76 updateLogicalHeight(); | 79 updateLogicalHeight(); |
77 if (oldSize == size()) | 80 if (oldSize == size()) |
78 return; | 81 return; |
79 | 82 |
80 if (!selfNeedsLayout()) | 83 setNeedsLayout(); |
81 setNeedsLayout(); | |
82 } | 84 } |
83 | 85 |
84 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons() const | 86 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons() const |
85 { | 87 { |
86 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); | 88 HTMLCanvasElement* canvas = toHTMLCanvasElement(node()); |
87 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) | 89 if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated(
)) |
88 return CompositingReasonCanvas; | 90 return CompositingReasonCanvas; |
89 | 91 |
90 return CompositingReasonNone; | 92 return CompositingReasonNone; |
91 } | 93 } |
92 | 94 |
93 } // namespace blink | 95 } // namespace blink |
OLD | NEW |