std::string error_html;
GetContentClientExport()->renderer()->PrepareErrorPage(
render_frame(), error, failed_request.HttpMethod().Ascii(), &error_html);
- render_frame()->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL), "UTF-8",
- web_url, replace);
+ render_frame()->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL),
+ "UTF-8", web_url, replace);
#endif
}
}
void RenderFrameObserverEfl::DidChangeScrollOffset() {
-#if !defined(EWK_BRINGUP) // FIXME: m94 bringup
- if (render_frame()->GetRenderView()->GetMainRenderFrame() != render_frame())
+ if (render_frame()->GetMainRenderFrame() != render_frame()) {
return;
+ }
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
- blink::WebSize documentSize = frame->DocumentSize();
- blink::WebRect visibleContentRect = frame->VisibleContentRect();
- blink::WebSize maximumScrollOffset(
- documentSize.width - visibleContentRect.width,
- documentSize.height - visibleContentRect.height);
+ gfx::Size documentSize = frame->DocumentSize();
+ gfx::Rect visibleContentRect = frame->VisibleContentRect();
+ gfx::Size maximumScrollOffset(
+ documentSize.width() - visibleContentRect.width(),
+ documentSize.height() - visibleContentRect.height());
if (max_scroll_offset_ != maximumScrollOffset) {
max_scroll_offset_ = maximumScrollOffset;
Send(new EwkHostMsg_DidChangeMaxScrollOffset(render_frame()->GetRoutingID(),
- maximumScrollOffset.width,
- maximumScrollOffset.height));
+ maximumScrollOffset.width(),
+ maximumScrollOffset.height()));
}
- if (last_scroll_offset_ != frame->GetScrollOffset()) {
- last_scroll_offset_ = frame->GetScrollOffset();
+ gfx::Size scrollOffsetSize(frame->GetScrollOffset().x(),
+ frame->GetScrollOffset().y());
+
+ if (last_scroll_offset_ != scrollOffsetSize) {
+ last_scroll_offset_ = scrollOffsetSize;
Send(new EwkHostMsg_DidChangeScrollOffset(render_frame()->GetRoutingID(),
- frame->GetScrollOffset().width,
- frame->GetScrollOffset().height));
+ last_scroll_offset_.width(),
+ last_scroll_offset_.height()));
}
-#endif
}
void RenderFrameObserverEfl::WillSubmitForm(