Skip to content

Commit 7ca802e

Browse files
patricia-gallardopatricia-gallardo
authored
Integrate 88.0.4324.150 (#1)
Flash is gone TextSelection patch dropped ErrorPage patch dropped xscrnsaver patch dropped
1 parent f25f391 commit 7ca802e

38 files changed

+110
-354
lines changed

‎src/core/accessibility_tree_formatter_qt.cpp

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,11 @@ class AccessibilityTreeFormatterQt : public AccessibilityTreeFormatterBase {
5959
explicit AccessibilityTreeFormatterQt();
6060
~AccessibilityTreeFormatterQt() override;
6161

62-
std::unique_ptr<base::DictionaryValue> BuildAccessibilityTreeForSelector(const content::AccessibilityTreeFormatter::TreeSelector &)
63-
{ return nullptr; }
64-
std::unique_ptr<base::DictionaryValue> BuildAccessibilityTreeForWindow(gfx::AcceleratedWidget) override { return nullptr; }
65-
std::unique_ptr<base::DictionaryValue> BuildAccessibilityTree(content::BrowserAccessibility *) override;
62+
base::Value BuildTreeForSelector(const AXTreeSelector&) const override { return {}; }
63+
base::Value BuildTreeForWindow(gfx::AcceleratedWidget widget) const override { return {}; }
64+
std::unique_ptr<base::DictionaryValue> BuildAccessibilityTree(content::BrowserAccessibility *) override;
6665

6766
private:
68-
base::FilePath::StringType GetExpectedFileSuffix() override;
69-
const std::string GetAllowEmptyString() override;
70-
const std::string GetAllowString() override;
71-
const std::string GetDenyString() override;
72-
const std::string GetDenyNodeString() override;
73-
const std::string GetRunUntilEventString() override;
7467
void RecursiveBuildAccessibilityTree(const content::BrowserAccessibility &node, base::DictionaryValue *dict) const;
7568
void AddProperties(const BrowserAccessibility &node, base::DictionaryValue *dict) const;
7669
std::string ProcessTreeForOutput(const base::DictionaryValue &node, base::DictionaryValue * = nullptr) override;
@@ -210,43 +203,13 @@ std::string AccessibilityTreeFormatterQt::ProcessTreeForOutput(const base::Dicti
210203
return line + "\n";
211204
}
212205

213-
base::FilePath::StringType AccessibilityTreeFormatterQt::GetExpectedFileSuffix()
214-
{
215-
return FILE_PATH_LITERAL("-expected-qt.txt");
216-
}
217-
218-
const std::string AccessibilityTreeFormatterQt::GetAllowEmptyString()
219-
{
220-
return "@QT-ALLOW-EMPTY:";
221-
}
222-
223-
const std::string AccessibilityTreeFormatterQt::GetAllowString()
224-
{
225-
return "@QT-ALLOW:";
226-
}
227-
228-
const std::string AccessibilityTreeFormatterQt::GetDenyString()
229-
{
230-
return "@QT-DENY:";
231-
}
232-
233-
const std::string AccessibilityTreeFormatterQt::GetDenyNodeString()
234-
{
235-
return "@QT-DENY-NODE:";
236-
}
237-
238-
const std::string AccessibilityTreeFormatterQt::GetRunUntilEventString()
239-
{
240-
return "@QT-RUN-UNTIL-EVENT:";
241-
}
242-
243206
#endif // QT_CONFIG(accessibility)
244207

245208
// static
246-
std::unique_ptr<AccessibilityTreeFormatter> AccessibilityTreeFormatter::Create()
209+
std::unique_ptr<ui::AXTreeFormatter> AccessibilityTreeFormatter::Create()
247210
{
248211
#if QT_CONFIG(accessibility)
249-
return std::unique_ptr<AccessibilityTreeFormatter>(new AccessibilityTreeFormatterQt());
212+
return std::unique_ptr<ui::AXTreeFormatter>(new AccessibilityTreeFormatterQt());
250213
#else
251214
return nullptr;
252215
#endif

‎src/core/browser_accessibility_manager_qt.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ void BrowserAccessibilityManagerQt::FireGeneratedEvent(ui::AXEventGenerator::Eve
151151
BrowserAccessibilityQt *iface = static_cast<BrowserAccessibilityQt*>(node);
152152

153153
switch (event_type) {
154-
case ui::AXEventGenerator::Event::VALUE_CHANGED:
154+
case ui::AXEventGenerator::Event::RANGE_VALUE_CHANGED:
155+
case ui::AXEventGenerator::Event::SELECTED_VALUE_CHANGED:
156+
case ui::AXEventGenerator::Event::VALUE_IN_TEXT_FIELD_CHANGED:
155157
if (iface->role() == QAccessible::EditableText) {
156158
QAccessibleTextUpdateEvent event(iface, -1, QString(), QString());
157159
QAccessible::updateAccessibility(&event);

‎src/core/clipboard_qt.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#include "ui/base/clipboard/custom_data_helper.h"
5252
#include "ui/base/clipboard/clipboard.h"
5353
#include "ui/base/clipboard/clipboard_constants.h"
54-
#include "ui/base/clipboard/clipboard_data_endpoint.h"
5554
#include "ui/base/clipboard/clipboard_format_type.h"
5655

5756
#include <QGuiApplication>
@@ -107,7 +106,7 @@ Clipboard *Clipboard::Create()
107106

108107
namespace QtWebEngineCore {
109108

110-
void ClipboardQt::WritePortableRepresentations(ui::ClipboardBuffer type, const ObjectMap &objects, std::unique_ptr<ui::ClipboardDataEndpoint> data_src)
109+
void ClipboardQt::WritePortableRepresentations(ui::ClipboardBuffer type, const ObjectMap &objects, std::unique_ptr<ui::DataTransferEndpoint> data_src)
111110
{
112111
DCHECK(CalledOnValidThread());
113112
DCHECK(IsSupportedClipboardBuffer(type));
@@ -134,7 +133,7 @@ void ClipboardQt::WritePortableRepresentations(ui::ClipboardBuffer type, const O
134133

135134
void ClipboardQt::WritePlatformRepresentations(ui::ClipboardBuffer buffer,
136135
std::vector<ui::Clipboard::PlatformRepresentation> platform_representations,
137-
std::unique_ptr<ui::ClipboardDataEndpoint> data_src)
136+
std::unique_ptr<ui::DataTransferEndpoint> data_src)
138137
{
139138
DCHECK(CalledOnValidThread());
140139
DCHECK(IsSupportedClipboardBuffer(buffer));
@@ -194,7 +193,7 @@ void ClipboardQt::WriteData(const ui::ClipboardFormatType &format, const char *d
194193

195194
bool ClipboardQt::IsFormatAvailable(const ui::ClipboardFormatType &format,
196195
ui::ClipboardBuffer type,
197-
const ui::ClipboardDataEndpoint *data_dst) const
196+
const ui::DataTransferEndpoint *data_dst) const
198197
{
199198
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
200199
type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
@@ -208,7 +207,7 @@ void ClipboardQt::Clear(ui::ClipboardBuffer type)
208207
}
209208

210209
void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type,
211-
const ui::ClipboardDataEndpoint *data_dst,
210+
const ui::DataTransferEndpoint *data_dst,
212211
std::vector<base::string16> *types) const
213212
{
214213
if (!types) {
@@ -232,7 +231,7 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type,
232231
}
233232

234233
void ClipboardQt::ReadText(ui::ClipboardBuffer type,
235-
const ui::ClipboardDataEndpoint *data_dst,
234+
const ui::DataTransferEndpoint *data_dst,
236235
base::string16 *result) const
237236
{
238237
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -242,7 +241,7 @@ void ClipboardQt::ReadText(ui::ClipboardBuffer type,
242241
}
243242

244243
void ClipboardQt::ReadAsciiText(ui::ClipboardBuffer type,
245-
const ui::ClipboardDataEndpoint *data_dst,
244+
const ui::DataTransferEndpoint *data_dst,
246245
std::string *result) const
247246
{
248247
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -252,7 +251,7 @@ void ClipboardQt::ReadAsciiText(ui::ClipboardBuffer type,
252251
}
253252

254253
void ClipboardQt::ReadHTML(ui::ClipboardBuffer type,
255-
const ui::ClipboardDataEndpoint *data_dst,
254+
const ui::DataTransferEndpoint *data_dst,
256255
base::string16 *markup, std::string *src_url,
257256
uint32_t *fragment_start, uint32_t *fragment_end) const
258257
{
@@ -271,7 +270,7 @@ void ClipboardQt::ReadHTML(ui::ClipboardBuffer type,
271270
}
272271

273272
void ClipboardQt::ReadRTF(ui::ClipboardBuffer type,
274-
const ui::ClipboardDataEndpoint *data_dst,
273+
const ui::DataTransferEndpoint *data_dst,
275274
std::string *result) const
276275
{
277276
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -283,7 +282,7 @@ void ClipboardQt::ReadRTF(ui::ClipboardBuffer type,
283282
}
284283

285284
void ClipboardQt::ReadImage(ui::ClipboardBuffer type,
286-
const ui::ClipboardDataEndpoint *data_dst,
285+
const ui::DataTransferEndpoint *data_dst,
287286
ReadImageCallback callback) const
288287
{
289288
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -311,7 +310,7 @@ void ClipboardQt::ReadImage(ui::ClipboardBuffer type,
311310
}
312311

313312
void ClipboardQt::ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type,
314-
const ui::ClipboardDataEndpoint *data_dst,
313+
const ui::DataTransferEndpoint *data_dst,
315314
base::string16 *result) const
316315
{
317316
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -322,13 +321,13 @@ void ClipboardQt::ReadCustomData(ui::ClipboardBuffer clipboard_type, const base:
322321
ui::ReadCustomDataForType(customData.constData(), customData.size(), type, result);
323322
}
324323

325-
void ClipboardQt::ReadBookmark(const ui::ClipboardDataEndpoint *data_dst, base::string16 *title, std::string *url) const
324+
void ClipboardQt::ReadBookmark(const ui::DataTransferEndpoint *data_dst, base::string16 *title, std::string *url) const
326325
{
327326
NOTIMPLEMENTED();
328327
}
329328

330329
void ClipboardQt::ReadSvg(ui::ClipboardBuffer clipboard_type,
331-
const ui::ClipboardDataEndpoint *,
330+
const ui::DataTransferEndpoint *,
332331
base::string16 *result) const
333332
{
334333
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
@@ -347,7 +346,7 @@ void ClipboardQt::WriteSvg(const char *svg_data, size_t data_len)
347346
}
348347

349348
void ClipboardQt::ReadData(const ui::ClipboardFormatType &format,
350-
const ui::ClipboardDataEndpoint *data_dst,
349+
const ui::DataTransferEndpoint *data_dst,
351350
std::string *result) const
352351
{
353352
const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData();
@@ -371,7 +370,7 @@ bool ClipboardQt::IsSelectionBufferAvailable() const
371370
}
372371
#endif
373372

374-
std::vector<base::string16> ClipboardQt::ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::ClipboardDataEndpoint *data_dst) const
373+
std::vector<base::string16> ClipboardQt::ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const
375374
{
376375
// based on ClipboardAura
377376
std::vector<base::string16> types;

‎src/core/clipboard_qt.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,37 +50,37 @@ class ClipboardQt : public ui::Clipboard
5050
uint64_t GetSequenceNumber(ui::ClipboardBuffer type) const override;
5151
bool IsFormatAvailable(const ui::ClipboardFormatType &format,
5252
ui::ClipboardBuffer buffer,
53-
const ui::ClipboardDataEndpoint *data_dst) const override;
53+
const ui::DataTransferEndpoint *data_dst) const override;
5454
void Clear(ui::ClipboardBuffer type) override;
5555
void ReadAvailableTypes(ui::ClipboardBuffer type,
56-
const ui::ClipboardDataEndpoint *data_dst,
56+
const ui::DataTransferEndpoint *data_dst,
5757
std::vector<base::string16> *types) const override;
58-
void ReadText(ui::ClipboardBuffer type, const ui::ClipboardDataEndpoint *data_dst, base::string16 *result) const override;
59-
void ReadAsciiText(ui::ClipboardBuffer type, const ui::ClipboardDataEndpoint *data_dst, std::string *result) const override;
60-
void ReadHTML(ui::ClipboardBuffer type, const ui::ClipboardDataEndpoint *data_dst, base::string16 *markup, std::string *src_url, uint32_t *fragment_start,
58+
void ReadText(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, base::string16 *result) const override;
59+
void ReadAsciiText(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
60+
void ReadHTML(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, base::string16 *markup, std::string *src_url, uint32_t *fragment_start,
6161
uint32_t *fragment_end) const override;
62-
void ReadRTF(ui::ClipboardBuffer type, const ui::ClipboardDataEndpoint *data_dst, std::string *result) const override;
63-
void ReadImage(ui::ClipboardBuffer buffer, const ui::ClipboardDataEndpoint *data_dst, ReadImageCallback callback) const override;
64-
void ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type, const ui::ClipboardDataEndpoint *data_dst, base::string16 *result) const override;
65-
void ReadBookmark(const ui::ClipboardDataEndpoint *data_dst, base::string16 *title, std::string *url) const override;
66-
void ReadData(const ui::ClipboardFormatType &format, const ui::ClipboardDataEndpoint *data_dst, std::string *result) const override;
62+
void ReadRTF(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
63+
void ReadImage(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst, ReadImageCallback callback) const override;
64+
void ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type, const ui::DataTransferEndpoint *data_dst, base::string16 *result) const override;
65+
void ReadBookmark(const ui::DataTransferEndpoint *data_dst, base::string16 *title, std::string *url) const override;
66+
void ReadData(const ui::ClipboardFormatType &format, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
6767
#if defined(USE_OZONE)
6868
bool IsSelectionBufferAvailable() const override;
6969
#endif
7070
void OnPreShutdown() override {}
71-
void ReadSvg(ui::ClipboardBuffer, const ui::ClipboardDataEndpoint *, base::string16 *) const override;
71+
void ReadSvg(ui::ClipboardBuffer, const ui::DataTransferEndpoint *, base::string16 *) const override;
7272
void WriteSvg(const char *, size_t) override;
73-
std::vector<base::string16> ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::ClipboardDataEndpoint *data_dst) const override;
73+
std::vector<base::string16> ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const override;
7474

7575
protected:
7676
void WritePortableRepresentations(
7777
ui::ClipboardBuffer buffer,
7878
const ObjectMap &objects,
79-
std::unique_ptr<ui::ClipboardDataEndpoint> data_src) override;
79+
std::unique_ptr<ui::DataTransferEndpoint> data_src) override;
8080
void WritePlatformRepresentations(
8181
ui::ClipboardBuffer buffer,
8282
std::vector<Clipboard::PlatformRepresentation> platform_representations,
83-
std::unique_ptr<ui::ClipboardDataEndpoint> data_src) override;
83+
std::unique_ptr<ui::DataTransferEndpoint> data_src) override;
8484
void WriteText(const char *text_data, size_t text_len) override;
8585
void WriteHTML(const char *markup_data, size_t markup_len, const char *url_data, size_t url_len) override;
8686
void WriteRTF(const char *rtf_data, size_t data_len) override;

‎src/core/compositor/display_gl_output_surface.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,16 +276,6 @@ unsigned DisplayGLOutputSurface::UpdateGpuFence()
276276
return 0;
277277
}
278278

279-
scoped_refptr<gpu::GpuTaskSchedulerHelper> DisplayGLOutputSurface::GetGpuTaskSchedulerHelper()
280-
{
281-
return m_vizContextProvider->GetGpuTaskSchedulerHelper();
282-
}
283-
284-
gpu::MemoryTracker *DisplayGLOutputSurface::GetMemoryTracker()
285-
{
286-
return m_vizContextProvider->GetMemoryTracker();
287-
}
288-
289279
void DisplayGLOutputSurface::SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback)
290280
{
291281
m_vizContextProvider->SetUpdateVSyncParametersCallback(std::move(callback));

‎src/core/compositor/display_gl_output_surface.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ class Display;
5454
class SyntheticBeginFrameSource;
5555
} // namespace viz
5656

57+
namespace gpu {
58+
class MemoryTracker;
59+
} // namespace gpu
60+
5761
namespace QtWebEngineCore {
5862

5963
// NOTE: Some methods are defined in display_gl_output_surface_qsg.cpp due
@@ -85,8 +89,6 @@ class DisplayGLOutputSurface final : public viz::OutputSurface, public DisplayPr
8589
void SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback) override;
8690
void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
8791
gfx::OverlayTransform GetDisplayTransform() override;
88-
scoped_refptr<gpu::GpuTaskSchedulerHelper> GetGpuTaskSchedulerHelper() override;
89-
gpu::MemoryTracker *GetMemoryTracker() override;
9092

9193
// Overridden from DisplayProducer.
9294
QSGNode *updatePaintNode(QSGNode *oldNode, RenderWidgetHostViewQtDelegate *delegate) override;

0 commit comments

Comments
 (0)