mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Remove CEF-specific integer and char16 typedef's (see #3507)
This commit is contained in:
@@ -523,7 +523,7 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
|
||||
bool OnQuery(CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefFrame> frame,
|
||||
int64 query_id,
|
||||
int64_t query_id,
|
||||
const CefString& request,
|
||||
bool persistent,
|
||||
CefRefPtr<Callback> callback) override {
|
||||
@@ -666,7 +666,7 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
|
||||
bool handleBoundsQuery(CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefFrame> frame,
|
||||
int64 query_id,
|
||||
int64_t query_id,
|
||||
const CefString& request,
|
||||
bool persistent,
|
||||
CefRefPtr<Callback> callback) {
|
||||
@@ -854,7 +854,7 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
|
||||
// start test only when painting something else then background
|
||||
if (IsBackgroundInBuffer(
|
||||
reinterpret_cast<const uint32*>(buffer), width * height,
|
||||
reinterpret_cast<const uint32_t*>(buffer), width * height,
|
||||
test_type_ == OSR_TEST_TRANSPARENCY ? 0x00000000 : 0xFFFFFFFF)) {
|
||||
return;
|
||||
}
|
||||
@@ -867,7 +867,7 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
EXPECT_EQ(dirtyRects.size(), 1U);
|
||||
EXPECT_TRUE(IsFullRepaint(dirtyRects[0], GetScaledInt(kOsrWidth),
|
||||
GetScaledInt(kOsrHeight)));
|
||||
EXPECT_EQ(0xffff7f7fU, *(reinterpret_cast<const uint32*>(buffer)));
|
||||
EXPECT_EQ(0xffff7f7fU, *(reinterpret_cast<const uint32_t*>(buffer)));
|
||||
DestroySucceededTestSoon();
|
||||
}
|
||||
break;
|
||||
@@ -877,7 +877,7 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
EXPECT_EQ(dirtyRects.size(), 1U);
|
||||
EXPECT_TRUE(IsFullRepaint(dirtyRects[0], GetScaledInt(kOsrWidth),
|
||||
GetScaledInt(kOsrHeight)));
|
||||
EXPECT_EQ(0x80800000U, *(reinterpret_cast<const uint32*>(buffer)));
|
||||
EXPECT_EQ(0x80800000U, *(reinterpret_cast<const uint32_t*>(buffer)));
|
||||
DestroySucceededTestSoon();
|
||||
}
|
||||
break;
|
||||
@@ -988,9 +988,9 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
// Unselected option background color is cyan.
|
||||
// Go down 100 pixels to skip the selected option and over 5 pixels
|
||||
// to avoid hitting the border.
|
||||
const uint32 offset = dirtyRects[0].width * 100 + 5;
|
||||
const uint32_t offset = dirtyRects[0].width * 100 + 5;
|
||||
EXPECT_EQ(0xff00ffff,
|
||||
*(reinterpret_cast<const uint32*>(buffer) + offset));
|
||||
*(reinterpret_cast<const uint32_t*>(buffer) + offset));
|
||||
|
||||
if (ExpectComputedPopupSize()) {
|
||||
EXPECT_EQ(expanded_select_rect.width, width);
|
||||
@@ -1505,9 +1505,9 @@ class OSRTestHandler : public RoutingTestHandler,
|
||||
return rc.width == width && rc.height == height;
|
||||
}
|
||||
|
||||
static bool IsBackgroundInBuffer(const uint32* buffer,
|
||||
static bool IsBackgroundInBuffer(const uint32_t* buffer,
|
||||
size_t size,
|
||||
uint32 rgba) {
|
||||
uint32_t rgba) {
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
if (buffer[i] != rgba) {
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user