OLD | NEW |
---|---|
1 /* | 1 /* |
skobes
2014/06/09 17:53:54
revert this file (no significant change)
| |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 |
11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1093 else | 1093 else |
1094 m_textAutosizer = 0; | 1094 m_textAutosizer = 0; |
1095 } | 1095 } |
1096 | 1096 |
1097 FastTextAutosizer::LayoutScope::~LayoutScope() | 1097 FastTextAutosizer::LayoutScope::~LayoutScope() |
1098 { | 1098 { |
1099 if (m_textAutosizer) | 1099 if (m_textAutosizer) |
1100 m_textAutosizer->endLayout(m_block); | 1100 m_textAutosizer->endLayout(m_block); |
1101 } | 1101 } |
1102 | 1102 |
1103 | |
1104 FastTextAutosizer::TableLayoutScope::TableLayoutScope(RenderTable* table) | 1103 FastTextAutosizer::TableLayoutScope::TableLayoutScope(RenderTable* table) |
1105 : LayoutScope(table) | 1104 : LayoutScope(table) |
1106 { | 1105 { |
1107 if (m_textAutosizer) { | 1106 if (m_textAutosizer) { |
1108 ASSERT(m_textAutosizer->shouldHandleLayout()); | 1107 ASSERT(m_textAutosizer->shouldHandleLayout()); |
1109 m_textAutosizer->inflateAutoTable(table); | 1108 m_textAutosizer->inflateAutoTable(table); |
1110 } | 1109 } |
1111 } | 1110 } |
1112 | 1111 |
1113 FastTextAutosizer::DeferUpdatePageInfo::DeferUpdatePageInfo(Page* page) | 1112 FastTextAutosizer::DeferUpdatePageInfo::DeferUpdatePageInfo(Page* page) |
1114 : m_mainFrame(page->mainFrame()) | 1113 : m_mainFrame(page->mainFrame()) |
1115 { | 1114 { |
1116 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) { | 1115 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) { |
1117 ASSERT(!textAutosizer->m_updatePageInfoDeferred); | 1116 ASSERT(!textAutosizer->m_updatePageInfoDeferred); |
1118 textAutosizer->m_updatePageInfoDeferred = true; | 1117 textAutosizer->m_updatePageInfoDeferred = true; |
1119 } | 1118 } |
1120 } | 1119 } |
1121 | 1120 |
1122 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo() | 1121 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo() |
1123 { | 1122 { |
1124 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) { | 1123 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto sizer()) { |
1125 ASSERT(textAutosizer->m_updatePageInfoDeferred); | 1124 ASSERT(textAutosizer->m_updatePageInfoDeferred); |
1126 textAutosizer->m_updatePageInfoDeferred = false; | 1125 textAutosizer->m_updatePageInfoDeferred = false; |
1127 textAutosizer->updatePageInfoInAllFrames(); | 1126 textAutosizer->updatePageInfoInAllFrames(); |
1128 } | 1127 } |
1129 } | 1128 } |
1130 | 1129 |
1131 } // namespace WebCore | 1130 } // namespace WebCore |
OLD | NEW |