bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/tests/ceftests/osr_display_unittest.cc

399 lines
12 KiB
C++
Raw Normal View History

Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
// Copyright (c) 2017 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
Various fixes related to the C++11/14 update (see issue #3140) - Convert scoped_ptr to std::unique_ptr from <memory> - Convert arraysize to base::size from include/base/cef_cxx17_backports.h - Convert NULL to nullptr - Include include/base/cef_callback.h instead of include/base/cef_bind.h - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead See the issue for additional details.
2021-06-17 22:08:01 +02:00
#include "include/base/cef_callback.h"
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
#include "include/wrapper/cef_closure_task.h"
#include "tests/ceftests/routing_test_handler.h"
#include "tests/gtest/include/gtest/gtest.h"
namespace {
const char kTestUrl1[] = "https://tests/DisplayTestHandler.START";
const char kTestUrl2[] = "https://tests/DisplayTestHandler.NAVIGATE";
const char kTestMsg[] = "DisplayTestHandler.Status";
// Default OSR widget size.
const int kOsrWidth = 600;
const int kOsrHeight = 400;
class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler {
public:
DisplayTestHandler() : status_(START) {}
CefRefPtr<CefRenderHandler> GetRenderHandler() override { return this; }
Clarify expectations for CefRenderHandler::GetViewRect (issue #1910)
2018-09-25 15:40:02 +02:00
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override {
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
}
bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
CefScreenInfo& screen_info) override {
screen_info.rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
screen_info.available_rect = screen_info.rect;
return true;
}
void OnPaint(CefRefPtr<CefBrowser> browser,
CefRenderHandler::PaintElementType type,
const CefRenderHandler::RectList& dirtyRects,
const void* buffer,
int width,
int height) override {
if (!got_paint_[status_]) {
got_paint_[status_].yes();
tests: Convert usage of base::Bind to Once or Repeating (see issue #3140)
2021-06-19 21:54:45 +02:00
if (status_ == START) {
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
OnStartIfDone();
tests: Convert usage of base::Bind to Once or Repeating (see issue #3140)
2021-06-19 21:54:45 +02:00
} else if (status_ == SHOW) {
CefPostTask(TID_UI,
base::BindOnce(&DisplayTestHandler::DestroyTest, this));
} else {
ADD_FAILURE();
}
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
}
}
void RunTest() override {
// Add the resources that we will navigate to/from.
AddResource(kTestUrl1, GetPageContents("Page1", "START"), "text/html");
AddResource(kTestUrl2, GetPageContents("Page2", "NAVIGATE"), "text/html");
// Create the browser.
CreateOSRBrowser(kTestUrl1);
// Time out the test after a reasonable period of time.
SetTestTimeout(5000);
}
bool OnQuery(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
Remove CEF-specific integer and char16 typedef's (see #3507)
2023-06-01 16:06:15 +02:00
int64_t query_id,
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
const CefString& request,
bool persistent,
CefRefPtr<Callback> callback) override {
const std::string& request_str = request.ToString();
if (request_str.find(kTestMsg) == 0) {
const std::string& status = request_str.substr(sizeof(kTestMsg));
if (status == "START") {
got_start_msg_.yes();
OnStartIfDone();
} else if (status == "NAVIGATE") {
got_navigate_msg_.yes();
// Wait a bit to verify no OnPaint callback.
CefPostDelayedTask(
tests: Convert usage of base::Bind to Once or Repeating (see issue #3140)
2021-06-19 21:54:45 +02:00
TID_UI, base::BindOnce(&DisplayTestHandler::OnNavigate, this), 250);
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
}
}
callback->Success("");
return true;
}
void DestroyTest() override {
EXPECT_TRUE(got_paint_[START]);
EXPECT_FALSE(got_paint_[NAVIGATE]);
EXPECT_TRUE(got_paint_[SHOW]);
EXPECT_TRUE(got_start_msg_);
EXPECT_TRUE(got_navigate_msg_);
EXPECT_EQ(status_, SHOW);
RoutingTestHandler::DestroyTest();
}
private:
void CreateOSRBrowser(const CefString& url) {
CefWindowInfo windowInfo;
CefBrowserSettings settings;
#if defined(OS_WIN)
windowInfo.SetAsWindowless(GetDesktopWindow());
#else
windowInfo.SetAsWindowless(kNullWindowHandle);
#endif
ceftests: Convert NULL to nullptr (see issue #2861)
2020-01-15 14:34:01 +01:00
CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr,
nullptr);
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
}
std::string GetPageContents(const std::string& name,
const std::string& status) {
Update to Chromium version 70.0.3507.0 (#578961)
2018-07-31 21:21:39 +02:00
return "<html><body>" + name + "<script>window.testQuery({request:'" +
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
std::string(kTestMsg) + ":" + status + "'});</script></body></html>";
}
void OnStartIfDone() {
tests: Convert usage of base::Bind to Once or Repeating (see issue #3140)
2021-06-19 21:54:45 +02:00
if (got_start_msg_ && got_paint_[START]) {
CefPostTask(TID_UI, base::BindOnce(&DisplayTestHandler::OnStart, this));
}
Fix incorrect OSR browser display during navigation (issue #2209)
2017-07-05 20:51:46 +02:00
}
void OnStart() {
EXPECT_EQ(status_, START);
// Hide the browser. OnPaint should not be called again until
// WasHidden(false) is explicitly called.
GetBrowser()->GetHost()->WasHidden(true);
status_ = NAVIGATE;
GetBrowser()->GetMainFrame()->LoadURL(kTestUrl2);
}
void OnNavigate() {
EXPECT_EQ(status_, NAVIGATE);
// Show the browser.
status_ = SHOW;
GetBrowser()->GetHost()->WasHidden(false);
// Force a call to OnPaint.
GetBrowser()->GetHost()->Invalidate(PET_VIEW);
}
enum Status {
START,
NAVIGATE,
SHOW,
STATUS_COUNT,
};
Status status_;
TrackCallback got_paint_[STATUS_COUNT];
TrackCallback got_start_msg_;
TrackCallback got_navigate_msg_;
IMPLEMENT_REFCOUNTING(DisplayTestHandler);
};
} // namespace
// Test that browser visibility is not changed due to navigation.
TEST(OSRTest, NavigateWhileHidden) {
CefRefPtr<DisplayTestHandler> handler = new DisplayTestHandler();
handler->ExecuteTest();
ReleaseAndWaitForDestructor(handler);
}
Fix OSR crash on window.open with new client (fixes issue #2894)
2020-03-06 20:51:58 +01:00
namespace {
const char kOsrPopupJSOtherClientMainUrl[] =
"http://www.tests-pjse.com/main.html";
class OsrPopupJSOtherClientTestHandler : public TestHandler,
public CefRenderHandler {
public:
OsrPopupJSOtherClientTestHandler(CefRefPtr<CefClient> other) {
other_ = other;
}
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() override {
return this;
}
virtual void GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) override {
rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
}
virtual void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
void RunTest() override {
AddResource(kOsrPopupJSOtherClientMainUrl, "<html>Main</html>",
"text/html");
// Create the browser.
CreateOSRBrowser(kOsrPopupJSOtherClientMainUrl);
// Time out the test after a reasonable period of time.
SetTestTimeout();
}
bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& target_url,
const CefString& target_frame_name,
cef_window_open_disposition_t target_disposition,
bool user_gesture,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue>& extra_info,
bool* no_javascript_access) override {
#if defined(OS_WIN)
windowInfo.SetAsWindowless(GetDesktopWindow());
#else
windowInfo.SetAsWindowless(kNullWindowHandle);
#endif
client = other_;
got_before_popup_.yes();
return false;
}
void Close(CefRefPtr<CefBrowser> browser) {
browser->StopLoad();
CloseBrowser(browser, true);
}
void OnAfterCreated(CefRefPtr<CefBrowser> browser) override {
TestHandler::OnAfterCreated(browser);
if (browser->IsPopup()) {
got_after_created_popup_.yes();
}
}
void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading,
bool canGoBack,
bool canGoForward) override {
Update source files for bracket style
2023-01-02 23:59:03 +01:00
if (isLoading) {
Fix OSR crash on window.open with new client (fixes issue #2894)
2020-03-06 20:51:58 +01:00
return;
Update source files for bracket style
2023-01-02 23:59:03 +01:00
}
Fix OSR crash on window.open with new client (fixes issue #2894)
2020-03-06 20:51:58 +01:00
if (browser->IsPopup()) {
got_load_end_popup_.yes();
CefPostDelayedTask(
TID_UI,
tests: Convert usage of base::Bind to Once or Repeating (see issue #3140)
2021-06-19 21:54:45 +02:00
base::BindOnce(&OsrPopupJSOtherClientTestHandler::Close, this,
browser),
Fix OSR crash on window.open with new client (fixes issue #2894)
2020-03-06 20:51:58 +01:00
100);
} else {
browser->GetMainFrame()->LoadURL("javascript:window.open('about:blank')");
}
}
void OnBeforeClose(CefRefPtr<CefBrowser> browser) override {
TestHandler::OnBeforeClose(browser);
other_ = nullptr;
if (browser->IsPopup()) {
got_before_close_popup_.yes();
DestroyTest();
}
}
private:
void CreateOSRBrowser(const CefString& url) {
CefWindowInfo windowInfo;
CefBrowserSettings settings;
#if defined(OS_WIN)
windowInfo.SetAsWindowless(GetDesktopWindow());
#else
windowInfo.SetAsWindowless(kNullWindowHandle);
#endif
CefBrowserHost::CreateBrowser(windowInfo, this, url, settings, nullptr,
nullptr);
}
void DestroyTest() override {
EXPECT_TRUE(got_after_created_popup_);
EXPECT_TRUE(got_load_end_popup_);
EXPECT_TRUE(got_before_close_popup_);
EXPECT_TRUE(got_before_popup_);
TestHandler::DestroyTest();
}
TrackCallback got_before_popup_;
TrackCallback got_after_created_popup_;
TrackCallback got_load_end_popup_;
TrackCallback got_before_close_popup_;
CefRefPtr<CefClient> other_;
IMPLEMENT_REFCOUNTING(OsrPopupJSOtherClientTestHandler);
};
class OsrPopupJSOtherCefClient : public CefClient,
public CefLoadHandler,
public CefLifeSpanHandler,
public CefRenderHandler {
public:
Various fixes related to the C++11/14 update (see issue #3140) - Convert scoped_ptr to std::unique_ptr from <memory> - Convert arraysize to base::size from include/base/cef_cxx17_backports.h - Convert NULL to nullptr - Include include/base/cef_callback.h instead of include/base/cef_bind.h - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead See the issue for additional details.
2021-06-17 22:08:01 +02:00
OsrPopupJSOtherCefClient() { handler_ = nullptr; }
Fix OSR crash on window.open with new client (fixes issue #2894)
2020-03-06 20:51:58 +01:00
void SetHandler(CefRefPtr<OsrPopupJSOtherClientTestHandler> handler) {
handler_ = handler;
}
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() override { return this; }
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() override {
return this;
}
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override {
return this;
}
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
bool isLoading,
bool canGoBack,
bool canGoForward) override {
if (handler_) {
handler_->OnLoadingStateChange(browser, isLoading, canGoBack,
canGoForward);
}
}
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) override {
handler_->OnAfterCreated(browser);
}
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override {
handler_->OnBeforeClose(browser);
handler_ = nullptr;
}
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
const CefString& target_url,
const CefString& target_frame_name,
cef_window_open_disposition_t target_disposition,
bool user_gesture,
const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo,
CefRefPtr<CefClient>& client,
CefBrowserSettings& settings,
CefRefPtr<CefDictionaryValue>& extra_info,
bool* no_javascript_access) override {
return true;
}
virtual void GetViewRect(CefRefPtr<CefBrowser> browser,
CefRect& rect) override {
rect = CefRect(0, 0, kOsrWidth, kOsrHeight);
}
virtual void OnPaint(CefRefPtr<CefBrowser> browser,
PaintElementType type,
const RectList& dirtyRects,
const void* buffer,
int width,
int height) override {}
private:
CefRefPtr<OsrPopupJSOtherClientTestHandler> handler_;
IMPLEMENT_REFCOUNTING(OsrPopupJSOtherCefClient);
};
} // namespace
// Test creation of an OSR-popup with another client.
TEST(OSRTest, OsrPopupJSOtherClient) {
CefRefPtr<OsrPopupJSOtherCefClient> client = new OsrPopupJSOtherCefClient();
CefRefPtr<OsrPopupJSOtherClientTestHandler> handler =
new OsrPopupJSOtherClientTestHandler(client);
client->SetHandler(handler);
handler->ExecuteTest();
ReleaseAndWaitForDestructor(handler);
Fix no newline at end of file error with Xcode 11.3.1
2020-04-02 19:36:45 +02:00
}