Skip to content

Commit 94ef97b

Browse files
sanketjsanketj
committed
[BlinkHelpers] Fixup various helpers to work correctly with CompressedPointer.
1 parent 0f48c87 commit 94ef97b

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎extensions/target-specific/chromium/blink/blink-helpers/blink-helpers.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Loader.OnLoad(function() {
2828
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::Document"), "URL", false, UserEditableFunctions.Create((document) => document.f("base_url_").f("string_").desc("Text")));
2929

3030
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Document"), "body", Chromium.RendererProcessType("blink::HTMLElement"), UserEditableFunctions.Create((document) => {
31-
return document.f("document_element_.raw_").dcast(Chromium.RendererProcessType("blink::HTMLHtmlElement"))
31+
return document.f("document_element_").F("Object").dcast(Chromium.RendererProcessType("blink::HTMLHtmlElement"))
3232
.then((htmlElement) => {
3333
if (!htmlElement.isNull()) {
3434
return htmlElement.array("child_nodes_").filter((childNode) => {
@@ -47,7 +47,7 @@ Loader.OnLoad(function() {
4747
.thenAll((nodeFlags, hasRareDataFlag) => {
4848
var nodeHasRareData = nodeFlags & hasRareDataFlag;
4949
if (nodeHasRareData) {
50-
return node.f("data_").f("rare_data_", "").f("raw_", "").as(Chromium.RendererProcessType("blink::NodeRareData"));
50+
return node.f("data_").F("Object").f("rare_data_").F("Object").as(Chromium.RendererProcessType("blink::NodeRareData"));
5151
} else {
5252
return DbgObject.NULL;
5353
}
@@ -101,12 +101,12 @@ Loader.OnLoad(function() {
101101

102102
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Node"), "node_layout_data_", Chromium.RendererProcessType("blink::NodeRenderingData"), UserEditableFunctions.Create((node) => {
103103
return node.F("rare_data_")
104-
.then((nodeRareData) => (!nodeRareData.isNull() ? nodeRareData : node.f("data_")))
105-
.then((nodeData) => nodeData.f("node_layout_data_", "").f("raw_", "").as(Chromium.RendererProcessType("blink::NodeRenderingData")));
104+
.then((nodeRareData) => (!nodeRareData.isNull() ? nodeRareData : node.f("data_").F("object")))
105+
.then((nodeData) => nodeData.f("node_layout_data_").F("Object").as(Chromium.RendererProcessType("blink::NodeRenderingData")));
106106
}));
107107

108108
function getCollectionFromOwnerNode(node, collectionTypeOrPromise) {
109-
return node.F("rare_data_").f("node_lists_.raw_").f("atomic_name_caches_").f("impl_")
109+
return node.F("rare_data_").f("node_lists_").F("Object").f("atomic_name_caches_").f("impl_")
110110
.then((hashTable) => {
111111
if (!hashTable.isNull()) {
112112
return Promise.all([hashTable.array("Pairs"), collectionTypeOrPromise])
@@ -118,7 +118,7 @@ Loader.OnLoad(function() {
118118
})
119119
.then((pairForCollectionType) => {
120120
console.assert(pairForCollectionType.length <= 1);
121-
return (pairForCollectionType.length > 0) ? pairForCollectionType[0].f("value.raw_").vcast() : DbgObject.NULL;
121+
return (pairForCollectionType.length > 0) ? pairForCollectionType[0].f("value").F("Object").vcast() : DbgObject.NULL;
122122
});
123123
} else {
124124
return DbgObject.NULL;
@@ -163,20 +163,20 @@ Loader.OnLoad(function() {
163163
}));
164164

165165
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Document"), "DOMSelection", Chromium.RendererProcessType("blink::DOMSelection"), UserEditableFunctions.Create((document) => {
166-
return document.f("tree_scope_.raw_").f("selection_.raw_");
166+
return document.f("tree_scope_").F("Object").f("selection_").F("Object");
167167
}));
168168

169169
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::ShadowRoot"), "DOMSelection", Chromium.RendererProcessType("blink::DOMSelection"), UserEditableFunctions.Create((shadowRoot) => {
170-
return shadowRoot.f("tree_scope_.raw_").f("selection_.raw_");
170+
return shadowRoot.f("tree_scope_").F("Object").f("selection_").F("Object");
171171
}));
172172

173173
DbgObject.AddTypeOverride(Chromium.RendererProcessType("blink::ShadowRoot"), "type_", "blink::ShadowRootType");
174174

175175
DbgObject.AddTypeOverride(Chromium.RendererProcessType("blink::DocumentMarkerController"), "possibly_existing_marker_types_", "blink::DocumentMarker::MarkerTypes");
176176

177177
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::DOMSelection"), "FrameSelection", Chromium.RendererProcessType("blink::FrameSelection"), UserEditableFunctions.Create((domSelection) => {
178-
return validExecutionContextOrNull(domSelection.f("execution_context_.raw_"))
179-
.then((validExecutionContextOrNull) => validExecutionContextOrNull.dcast(Chromium.RendererProcessType("blink::Document")).f("frame_.raw_").dcast(Chromium.RendererProcessType("blink::LocalFrame")).f("selection_.raw_"));
178+
return validExecutionContextOrNull(domSelection.f("execution_context_").F("Object"))
179+
.then((validExecutionContextOrNull) => validExecutionContextOrNull.dcast(Chromium.RendererProcessType("blink::Document")).f("frame_").F("Object").dcast(Chromium.RendererProcessType("blink::LocalFrame")).f("selection_").F("Object"));
180180
}));
181181

182182
function validExecutionContextOrNull(executionContext) {
@@ -185,28 +185,28 @@ Loader.OnLoad(function() {
185185
}
186186

187187
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Range"), "startContainer", Chromium.RendererProcessType("blink::Node"), UserEditableFunctions.Create((range) => {
188-
return range.f("start_").f("container_node_.raw_");
188+
return range.f("start_").f("container_node_").F("Object");
189189
}));
190190

191191
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::Range"), "startOffset", false, UserEditableFunctions.Create((range) => {
192192
return range.f("start_").f("offset_in_container_");
193193
}));
194194

195195
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Range"), "endContainer", Chromium.RendererProcessType("blink::Node"), UserEditableFunctions.Create((range) => {
196-
return range.f("end_").f("container_node_.raw_");
196+
return range.f("end_").f("container_node_").F("Object");
197197
}));
198198

199199
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::Range"), "endOffset", false, UserEditableFunctions.Create((range) => {
200200
return range.f("end_").f("offset_in_container_");
201201
}));
202202

203203
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::Element"), "id", false, UserEditableFunctions.Create((element) => {
204-
return element.f("element_data_.raw_")
204+
return element.f("element_data_").F("Object")
205205
.then((elementData) => (!elementData.isNull() ? elementData.f("id_for_style_resolution_").desc("Text") : ""));
206206
}));
207207

208208
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Node"), "ownerDocument", Chromium.RendererProcessType("blink::Document"), UserEditableFunctions.Create((node) => {
209-
return node.f("tree_scope_.raw_").f("document_.raw_")
209+
return node.f("tree_scope_").F("Object").f("document_").F("Object")
210210
.then((document) => (!node.equals(document) ? document : DbgObject.NULL));
211211
}));
212212

@@ -217,7 +217,7 @@ Loader.OnLoad(function() {
217217
}));
218218

219219
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Node"), "childNodes", Chromium.RendererProcessType("blink::NodeList"), UserEditableFunctions.Create((node) => {
220-
return node.F("rare_data_").f("node_lists_.raw_").f("child_node_list_.raw_");
220+
return node.F("rare_data_").f("node_lists_").F("Object").f("child_node_list_").F("Object");
221221
}));
222222

223223
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::HTMLDataListElement"), "options", Chromium.RendererProcessType("blink::HTMLDataListOptionsCollection"), UserEditableFunctions.Create((htmlDataListElement) => {
@@ -257,7 +257,7 @@ Loader.OnLoad(function() {
257257
}));
258258

259259
DbgObject.AddArrayField(Chromium.RendererProcessType("blink::Element"), "attributes_", Chromium.RendererProcessType("blink::Attribute"), UserEditableFunctions.Create((element) => {
260-
return element.f("element_data_.raw_")
260+
return element.f("element_data_").F("Object")
261261
.then((elementData) => {
262262
if (!elementData.isNull()) {
263263
return Promise.all([elementData.F("unique_element_data_"), elementData.F("shareable_element_data_")])
@@ -285,7 +285,7 @@ Loader.OnLoad(function() {
285285
}));
286286

287287
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Element"), "shadowRoot", Chromium.RendererProcessType("blink::ShadowRoot"), UserEditableFunctions.Create((element) => {
288-
return element.F("rare_data_").F("element_rare_data_").f("shadow_root_.raw_").vcast();
288+
return element.F("rare_data_").F("element_rare_data_").f("shadow_root_").F("Object").vcast();
289289
}));
290290

291291
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::Element"), "tagName", false, UserEditableFunctions.Create((element) => {
@@ -297,7 +297,7 @@ Loader.OnLoad(function() {
297297
}));
298298

299299
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::Node"), "assigned_slot_", Chromium.RendererProcessType("blink::HTMLSlotElement"), UserEditableFunctions.Create((node) => {
300-
return node.F("rare_data_").f("flat_tree_node_data_.raw_").f("assigned_slot_.raw_");
300+
return node.F("rare_data_").f("flat_tree_node_data_").F("Object").f("assigned_slot_").F("Object");
301301
}));
302302

303303
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::QualifiedName"), "Prefix", false, UserEditableFunctions.Create((qualifiedName) => {
@@ -325,19 +325,19 @@ Loader.OnLoad(function() {
325325
}));
326326

327327
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::HTMLFrameOwnerElement"), "contentWindow", Chromium.RendererProcessType("blink::DOMWindow"), UserEditableFunctions.Create((frameOwnerElement) => {
328-
return frameOwnerElement.f("content_frame_.raw_").f("dom_window_.raw_");
328+
return frameOwnerElement.f("content_frame_").F("Object").f("dom_window_").F("Object");
329329
}));
330330

331331
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::HTMLFrameOwnerElement"), "contentDocument", Chromium.RendererProcessType("blink::Document"), UserEditableFunctions.Create((frameOwnerElement) => {
332332
return frameOwnerElement.F("contentWindow").F("document");
333333
}));
334334

335335
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::DOMWindow"), "document", Chromium.RendererProcessType("blink::Document"), UserEditableFunctions.Create((domWindow) => {
336-
return domWindow.dcast(Chromium.RendererProcessType("blink::LocalDOMWindow")).f("document_.raw_");
336+
return domWindow.dcast(Chromium.RendererProcessType("blink::LocalDOMWindow")).f("document_").F("Object");
337337
}));
338338

339339
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::HTMLTemplateElement"), "content", Chromium.RendererProcessType("blink::TemplateContentDocumentFragment"), UserEditableFunctions.Create((templateElement) => {
340-
return templateElement.f("content_.raw_");
340+
return templateElement.f("content_").F("Object");
341341
}));
342342

343343
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::HTMLInputElement"), "type", false, UserEditableFunctions.Create((inputElement) => {
@@ -393,10 +393,10 @@ Loader.OnLoad(function() {
393393
return inputElement.F("shadowRoot").array("child_nodes_").dcast(Chromium.RendererProcessType("blink::PickerIndicatorElement")).filter((pickerIndicatorElement) => !pickerIndicatorElement.isNull())
394394
.then((pickerIndicatorElement) => {
395395
console.assert(pickerIndicatorElement.length == 1);
396-
return pickerIndicatorElement[0].f("chooser_.raw_").vcast();
396+
return pickerIndicatorElement[0].f("chooser_").F("Object").vcast();
397397
});
398398
} else if (!colorInputType.isNull()) {
399-
return colorInputType.f("chooser_.raw_").vcast();
399+
return colorInputType.f("chooser_").F("Object").vcast();
400400
} else {
401401
return DbgObject.NULL;
402402
}
@@ -405,11 +405,11 @@ Loader.OnLoad(function() {
405405
}));
406406

407407
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::WebPagePopupImpl"), "document_", Chromium.RendererProcessType("blink::HTMLDocument"), UserEditableFunctions.Create((webPagePopupImpl) => {
408-
return webPagePopupImpl.f("page_.raw_").f("main_frame_.raw_").dcast(Chromium.RendererProcessType("blink::LocalFrame")).f("dom_window_.raw_").F("document").vcast();
408+
return webPagePopupImpl.f("page_").F("Object").f("main_frame_").F("Object").dcast(Chromium.RendererProcessType("blink::LocalFrame")).f("dom_window_").F("Object").F("document").vcast();
409409
}));
410410

411411
DbgObject.AddExtendedField(Chromium.RendererProcessType("blink::HTMLInputElement"), "specialized_input_type_", Chromium.RendererProcessType("blink::InputType"), UserEditableFunctions.Create((inputElement) => {
412-
return inputElement.f("input_type_.raw_").vcast();
412+
return inputElement.f("input_type_").F("Object").vcast();
413413
}));
414414

415415
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::BaseButtonInputType"), "value_mode_", false, () => "default");
@@ -422,7 +422,7 @@ Loader.OnLoad(function() {
422422
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::TextFieldInputType"), "value_mode_", false, () => "value");
423423

424424
DbgObject.AddTypeDescription(Chromium.RendererProcessType("blink::ColorInputType"), "color_", false, UserEditableFunctions.Create((colorInputType) => {
425-
return colorInputType.f("element_.raw_").desc("value")
425+
return colorInputType.f("element_").F("Object").desc("value")
426426
.then((hexValue) => {
427427
var colorValue = parseInt(hexValue.substr(1), 16);
428428
var rgbChannels = [(colorValue >> 16) & 0xFF, (colorValue >> 8) & 0xFF, colorValue & 0xFF];
@@ -898,7 +898,7 @@ Loader.OnLoad(function() {
898898
.then((parentFrame) => !parentFrame.isNull());
899899
});
900900
})
901-
.then((sortedWebFrames) => Promise.map(sortedWebFrames, (webFrame) => webFrame.vcast().f("frame_.raw_").f("dom_window_.raw_").F("document")))
901+
.then((sortedWebFrames) => Promise.map(sortedWebFrames, (webFrame) => webFrame.vcast().f("frame_").F("Object").f("dom_window_").F("Object").F("document")))
902902
.then((sortedDocuments) => Promise.filter(sortedDocuments, (document) => !document.isNull()))
903903
},
904904
GetRootLayoutObjects: (...typenames_for_error) => {

0 commit comments

Comments
 (0)