mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-25 17:12:25 +01:00
241941a44a
This change moves the SendProcessMessage method from CefBrowser to CefFrame and adds CefBrowser parameters to OnProcessMessageReceived and OnDraggableRegionsChanged. The internal implementation has changed as follows: - Frame IDs are now a 64-bit combination of the 32-bit render_process_id and render_routing_id values that uniquely identify a RenderFrameHost (RFH). - CefFrameHostImpl objects are now managed by CefBrowserInfo with life span tied to RFH expectations. Specifically, a CefFrameHostImpl object representing a sub-frame will be created when a RenderFrame is created in the renderer process and detached when the associated RenderFrame is deleted or the renderer process in which it runs has died. - The CefFrameHostImpl object representing the main frame will always be valid but the underlying RFH (and associated frame ID) may change over time as a result of cross-origin navigations. Despite these changes calling LoadURL on the main frame object in the browser process will always navigate as expected. - Speculative RFHs, which may be created as a result of a cross-origin navigation and discarded if that navigation is not committed, are now handled correctly (e.g. ignored in most cases until they're committed). - It is less likely, but still possible, to receive a CefFrame object with an invalid frame ID (ID < 0). This can happen in cases where a RFH has not yet been created for a sub-frame. For example, when OnBeforeBrowse is called before initiating navigation in a previously nonexisting sub-frame. To test: All tests pass with NetworkService enabled and disabled.
174 lines
5.6 KiB
C++
174 lines
5.6 KiB
C++
// Copyright (c) 2015 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.
|
|
|
|
#include "include/wrapper/cef_closure_task.h"
|
|
#include "tests/ceftests/test_handler.h"
|
|
#include "tests/gtest/include/gtest/gtest.h"
|
|
|
|
namespace {
|
|
|
|
const char kTestURLWithRegions[] = "http://test.com/regions";
|
|
const char kTestHTMLWithRegions[] =
|
|
"<html>"
|
|
" <body>"
|
|
" <div style=\"position: absolute; top: 50px; left: 50px; width: 200px; "
|
|
"height: 200px; background-color: red; -webkit-app-region: drag;\">"
|
|
" <div style=\"position: absolute; top: 50%; left: 50%; "
|
|
"transform: translate(-50%, -50%); width: 50px; height: 50px; "
|
|
"background-color: blue; -webkit-app-region: no-drag;\">"
|
|
" </div>"
|
|
" </div>"
|
|
" </body>"
|
|
"</html>";
|
|
|
|
const char kTestURLWithoutRegions[] = "http://test.com/no-regions";
|
|
const char kTestHTMLWithoutRegions[] = "<html><body>Hello World!</body></html>";
|
|
|
|
const char kTestURLWithChangingRegions[] = "http://test.com/changing-regions";
|
|
const char kTestHTMLWithChangingRegions[] =
|
|
"<html>"
|
|
" <body>"
|
|
" <div id=\"layer\" style=\"position: absolute; top: 50px; left: 50px; "
|
|
"width: 200px; height: 200px; background-color: red; "
|
|
"-webkit-app-region: drag;\">"
|
|
" <div style=\"position: absolute; top: 50%; left: 50%; "
|
|
"transform: translate(-50%, -50%); width: 50px; height: 50px; "
|
|
"background-color: blue; -webkit-app-region: no-drag;\">"
|
|
" </div>"
|
|
" </div>"
|
|
" <script>"
|
|
" window.setTimeout(function() {"
|
|
" var layer = document.getElementById('layer');"
|
|
" layer.style.top = '0px';"
|
|
" layer.style.left = '0px';"
|
|
" }, 500);"
|
|
" </script>"
|
|
" </body>"
|
|
"</html>";
|
|
|
|
class DraggableRegionsTestHandler : public TestHandler, public CefDragHandler {
|
|
public:
|
|
DraggableRegionsTestHandler() : step_(kStepWithRegions) {}
|
|
|
|
void RunTest() override {
|
|
// Add HTML documents with and without draggable regions.
|
|
AddResource(kTestURLWithRegions, kTestHTMLWithRegions, "text/html");
|
|
AddResource(kTestURLWithoutRegions, kTestHTMLWithoutRegions, "text/html");
|
|
AddResource(kTestURLWithChangingRegions, kTestHTMLWithChangingRegions,
|
|
"text/html");
|
|
|
|
// Create the browser
|
|
CreateBrowser(kTestURLWithRegions);
|
|
|
|
// Time out the test after a reasonable period of time.
|
|
SetTestTimeout();
|
|
}
|
|
|
|
CefRefPtr<CefDragHandler> GetDragHandler() override { return this; }
|
|
|
|
void OnDraggableRegionsChanged(
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
const std::vector<CefDraggableRegion>& regions) override {
|
|
EXPECT_TRUE(CefCurrentlyOn(TID_UI));
|
|
EXPECT_TRUE(browser->IsSame(GetBrowser()));
|
|
EXPECT_TRUE(frame->IsMain());
|
|
|
|
did_call_on_draggable_regions_changed_.yes();
|
|
|
|
switch (step_) {
|
|
case kStepWithRegions:
|
|
case kStepWithChangingRegions1:
|
|
EXPECT_EQ(2U, regions.size());
|
|
EXPECT_EQ(50, regions[0].bounds.x);
|
|
EXPECT_EQ(50, regions[0].bounds.y);
|
|
EXPECT_EQ(200, regions[0].bounds.width);
|
|
EXPECT_EQ(200, regions[0].bounds.height);
|
|
EXPECT_EQ(1, regions[0].draggable);
|
|
EXPECT_EQ(125, regions[1].bounds.x);
|
|
EXPECT_EQ(125, regions[1].bounds.y);
|
|
EXPECT_EQ(50, regions[1].bounds.width);
|
|
EXPECT_EQ(50, regions[1].bounds.height);
|
|
EXPECT_EQ(0, regions[1].draggable);
|
|
break;
|
|
case kStepWithChangingRegions2:
|
|
EXPECT_EQ(2U, regions.size());
|
|
EXPECT_EQ(0, regions[0].bounds.x);
|
|
EXPECT_EQ(0, regions[0].bounds.y);
|
|
EXPECT_EQ(200, regions[0].bounds.width);
|
|
EXPECT_EQ(200, regions[0].bounds.height);
|
|
EXPECT_EQ(1, regions[0].draggable);
|
|
EXPECT_EQ(75, regions[1].bounds.x);
|
|
EXPECT_EQ(75, regions[1].bounds.y);
|
|
EXPECT_EQ(50, regions[1].bounds.width);
|
|
EXPECT_EQ(50, regions[1].bounds.height);
|
|
EXPECT_EQ(0, regions[1].draggable);
|
|
break;
|
|
case kStepWithoutRegions:
|
|
// Should not be reached.
|
|
EXPECT_TRUE(false);
|
|
break;
|
|
}
|
|
|
|
NextTest(browser);
|
|
}
|
|
|
|
void DestroyTest() override {
|
|
EXPECT_FALSE(did_call_on_draggable_regions_changed_);
|
|
|
|
TestHandler::DestroyTest();
|
|
}
|
|
|
|
private:
|
|
void NextTest(CefRefPtr<CefBrowser> browser) {
|
|
CefRefPtr<CefFrame> frame(browser->GetMainFrame());
|
|
|
|
did_call_on_draggable_regions_changed_.reset();
|
|
|
|
switch (step_) {
|
|
case kStepWithRegions:
|
|
step_ = kStepWithChangingRegions1;
|
|
frame->LoadURL(kTestURLWithChangingRegions);
|
|
break;
|
|
case kStepWithChangingRegions1:
|
|
step_ = kStepWithChangingRegions2;
|
|
break;
|
|
case kStepWithChangingRegions2:
|
|
step_ = kStepWithoutRegions;
|
|
frame->LoadURL(kTestURLWithoutRegions);
|
|
// Needed because this test doesn't call OnDraggableRegionsChanged.
|
|
CefPostDelayedTask(
|
|
TID_UI, base::Bind(&DraggableRegionsTestHandler::DestroyTest, this),
|
|
500);
|
|
break;
|
|
case kStepWithoutRegions: {
|
|
// Should not be reached.
|
|
EXPECT_TRUE(false);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
enum Step {
|
|
kStepWithRegions,
|
|
kStepWithChangingRegions1,
|
|
kStepWithChangingRegions2,
|
|
kStepWithoutRegions,
|
|
} step_;
|
|
|
|
TrackCallback did_call_on_draggable_regions_changed_;
|
|
|
|
IMPLEMENT_REFCOUNTING(DraggableRegionsTestHandler);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// Verify that draggable regions work.
|
|
TEST(DraggableRegionsTest, DraggableRegions) {
|
|
CefRefPtr<DraggableRegionsTestHandler> handler =
|
|
new DraggableRegionsTestHandler();
|
|
handler->ExecuteTest();
|
|
ReleaseAndWaitForDestructor(handler);
|
|
}
|