| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 Copyright (c) 2013 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <link rel="import" href="/tracing/base/quad.html"> | 8 <link rel="import" href="/tracing/base/math/quad.html"> |
| 9 <link rel="import" href="/tracing/base/rect.html"> | 9 <link rel="import" href="/tracing/base/math/rect.html"> |
| 10 <link rel="import" href="/tracing/model/object_instance.html"> | 10 <link rel="import" href="/tracing/model/object_instance.html"> |
| 11 <script> | 11 <script> |
| 12 | 12 |
| 13 'use strict'; | 13 'use strict'; |
| 14 | 14 |
| 15 tr.exportTo('tr.e.cc', function() { | 15 tr.exportTo('tr.e.cc', function() { |
| 16 var convertedNameCache = {}; | 16 var convertedNameCache = {}; |
| 17 function convertNameToJSConvention(name) { | 17 function convertNameToJSConvention(name) { |
| 18 if (name in convertedNameCache) | 18 if (name in convertedNameCache) |
| 19 return convertedNameCache[name]; | 19 return convertedNameCache[name]; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 104 |
| 105 for (var key in object) { | 105 for (var key in object) { |
| 106 var newKey = convertNameToJSConvention(key); | 106 var newKey = convertNameToJSConvention(key); |
| 107 if (newKey !== key) { | 107 if (newKey !== key) { |
| 108 var value = object[key]; | 108 var value = object[key]; |
| 109 delete object[key]; | 109 delete object[key]; |
| 110 object[newKey] = value; | 110 object[newKey] = value; |
| 111 key = newKey; | 111 key = newKey; |
| 112 } | 112 } |
| 113 | 113 |
| 114 // Convert objects with keys ending with Quad to tr.b.Quad type. | 114 // Convert objects with keys ending with Quad to tr.b.math.Quad type. |
| 115 if (/Quad$/.test(key) && !(object[key] instanceof tr.b.Quad)) { | 115 if (/Quad$/.test(key) && !(object[key] instanceof tr.b.math.Quad)) { |
| 116 var q; | 116 var q; |
| 117 try { | 117 try { |
| 118 q = tr.b.Quad.from8Array(object[key]); | 118 q = tr.b.math.Quad.from8Array(object[key]); |
| 119 } catch (e) { | 119 } catch (e) { |
| 120 } | 120 } |
| 121 object[key] = q; | 121 object[key] = q; |
| 122 continue; | 122 continue; |
| 123 } | 123 } |
| 124 | 124 |
| 125 // Convert objects with keys ending with Rect to tr.b.Rect type. | 125 // Convert objects with keys ending with Rect to tr.b.math.Rect type. |
| 126 if (/Rect$/.test(key) && !(object[key] instanceof tr.b.Rect)) { | 126 if (/Rect$/.test(key) && !(object[key] instanceof tr.b.math.Rect)) { |
| 127 var r; | 127 var r; |
| 128 try { | 128 try { |
| 129 r = tr.b.Rect.fromArray(object[key]); | 129 r = tr.b.math.Rect.fromArray(object[key]); |
| 130 } catch (e) { | 130 } catch (e) { |
| 131 } | 131 } |
| 132 object[key] = r; | 132 object[key] = r; |
| 133 } | 133 } |
| 134 | 134 |
| 135 preInitializeObjectInner(object[key], true); | 135 preInitializeObjectInner(object[key], true); |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 | 138 |
| 139 return { | 139 return { |
| 140 preInitializeObject: preInitializeObject, | 140 preInitializeObject: preInitializeObject, |
| 141 convertNameToJSConvention: convertNameToJSConvention, | 141 convertNameToJSConvention: convertNameToJSConvention, |
| 142 moveRequiredFieldsFromArgsToToplevel: moveRequiredFieldsFromArgsToToplevel, | 142 moveRequiredFieldsFromArgsToToplevel: moveRequiredFieldsFromArgsToToplevel, |
| 143 moveOptionalFieldsFromArgsToToplevel: moveOptionalFieldsFromArgsToToplevel, | 143 moveOptionalFieldsFromArgsToToplevel: moveOptionalFieldsFromArgsToToplevel, |
| 144 }; | 144 }; |
| 145 }); | 145 }); |
| 146 </script> | 146 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2771723003:
[tracing] Move math utilities from base into their own subdirectory (attempt 2) (Closed)
