projects
/
framework
/
web
/
webkit-efl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't draw contents to evas image when being background.
[framework/web/webkit-efl.git]
/
Source
/
WebKit2
/
UIProcess
/
API
/
efl
/
PageClientImpl.cpp
diff --git
a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index
8583168
..
b9d11a1
100755
(executable)
--- a/
Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/
Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@
-104,6
+104,7
@@
PageClientImpl::PageClientImpl(EwkViewImpl* viewImpl)
, m_scrollPositionBeforePageRendered(IntPoint())
#endif
, m_isVisible(true)
, m_scrollPositionBeforePageRendered(IntPoint())
#endif
, m_isVisible(true)
+ , m_deferUpdateViewportSize(false)
, m_isScrollableLayerFocused(false)
, m_isScrollableNodeFocused(false)
#if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE_BACKUP_IMAGE)
, m_isScrollableLayerFocused(false)
, m_isScrollableNodeFocused(false)
#if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE_BACKUP_IMAGE)
@@
-116,9
+117,6
@@
PageClientImpl::PageClientImpl(EwkViewImpl* viewImpl)
#if ENABLE(TIZEN_PRERENDERING_FOR_ROTATION)
, m_waitFrameOfNewViewortSize(false)
#endif
#if ENABLE(TIZEN_PRERENDERING_FOR_ROTATION)
, m_waitFrameOfNewViewortSize(false)
#endif
-#if ENABLE(TIZEN_BACKGROUND_DISK_CACHE)
- , m_isForeground(true)
-#endif
, m_nonemptyLayoutRendered(false)
#endif // #if OS(TIZEN)
{
, m_nonemptyLayoutRendered(false)
#endif // #if OS(TIZEN)
{
@@
-196,6
+194,14
@@
void PageClientImpl::updateViewportSize(const IntSize& viewportSize, const int a
#if ENABLE(TIZEN_DLOG_SUPPORT)
TIZEN_LOGI(" view size: [%d, %d], angle: [%d]", viewportSize.width(), viewportSize.height(), angle);
#endif
#if ENABLE(TIZEN_DLOG_SUPPORT)
TIZEN_LOGI(" view size: [%d, %d], angle: [%d]", viewportSize.width(), viewportSize.height(), angle);
#endif
+#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY)
+ if (m_deferUpdateViewportSize) {
+ m_visibleContentRect.setSize(viewportSize);
+ m_viewImpl->page()->setViewportSize(viewportSize);
+ m_deferUpdateViewportSize = false;
+ return;
+ }
+#endif
// update viewport size of webkit
m_viewImpl->page()->setViewportSize(viewportSize);
// update viewport size of webkit
m_viewImpl->page()->setViewportSize(viewportSize);
@@
-403,6
+409,10
@@
void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportAttribut
double scaleRatioBeforeRotation = m_scaleFactor / m_viewportConstraints.minimumScale;
m_viewportConstraints = computeViewportConstraints(attributes);
double scaleRatioBeforeRotation = m_scaleFactor / m_viewportConstraints.minimumScale;
m_viewportConstraints = computeViewportConstraints(attributes);
+#if ENABLE(TIZEN_GESTURE)
+ m_viewImpl->setDoubleTapEnabled(userScalable());
+#endif
+
// Initially, m_scaleFactor is not decided yet.
// So, we should update visible content rect at here.
if (!m_scaleFactor) {
// Initially, m_scaleFactor is not decided yet.
// So, we should update visible content rect at here.
if (!m_scaleFactor) {
@@
-444,6
+454,8
@@
void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportAttribut
if (isRotated) {
m_viewportAngle = angle;
newScale = m_viewportConstraints.minimumScale * scaleRatioBeforeRotation;
if (isRotated) {
m_viewportAngle = angle;
newScale = m_viewportConstraints.minimumScale * scaleRatioBeforeRotation;
+ if (m_viewportFitsToContent)
+ newScale = m_viewportConstraints.minimumScale;
newScrollPosition.scale(newScale / m_scaleFactor, newScale / m_scaleFactor);
}
newScrollPosition.scale(newScale / m_scaleFactor, newScale / m_scaleFactor);
}
@@
-919,7
+931,7
@@
void PageClientImpl::setVisibleContentRect(const IntRect& newRect, float newScal
displayViewport();
#if ENABLE(TIZEN_SCREEN_READER)
displayViewport();
#if ENABLE(TIZEN_SCREEN_READER)
- if (ScreenReaderProxy::screenReader().is
Enabled(
)
+ if (ScreenReaderProxy::screenReader().is
Active(m_viewImpl
)
&& (scrollPosition() != previousScrollPosition || m_scaleFactor != previousScale))
ewkViewGetFocusRing(m_viewImpl->view())->updateScrollAndScale(previousScrollPosition, previousScale);
#endif
&& (scrollPosition() != previousScrollPosition || m_scaleFactor != previousScale))
ewkViewGetFocusRing(m_viewImpl->view())->updateScrollAndScale(previousScrollPosition, previousScale);
#endif
@@
-1129,7
+1141,7
@@
void PageClientImpl::updateTextSelectionHandlesAndContextMenu(bool isShow, bool
m_textSelection->updateHandlesAndContextMenu(isShow, isScrolling);
}
m_textSelection->updateHandlesAndContextMenu(isShow, isScrolling);
}
-bool PageClientImpl::textSelectionDown(const WebCore::IntPoint& point
, bool isStartedTextSelectionFromOutside
)
+bool PageClientImpl::textSelectionDown(const WebCore::IntPoint& point)
{
if (!evas_object_focus_get(m_viewImpl->view())) {
InputMethodContextEfl* inputMethodContext = m_viewImpl->inputMethodContext();
{
if (!evas_object_focus_get(m_viewImpl->view())) {
InputMethodContextEfl* inputMethodContext = m_viewImpl->inputMethodContext();
@@
-1139,12
+1151,12
@@
bool PageClientImpl::textSelectionDown(const WebCore::IntPoint& point, bool isSt
evas_object_focus_set(m_viewImpl->view(), true);
}
evas_object_focus_set(m_viewImpl->view(), true);
}
- return m_textSelection->textSelectionDown(point
, isStartedTextSelectionFromOutside
);
+ return m_textSelection->textSelectionDown(point);
}
}
-void PageClientImpl::textSelectionMove(const WebCore::IntPoint& point
, bool isStartedTextSelectionFromOutside
)
+void PageClientImpl::textSelectionMove(const WebCore::IntPoint& point)
{
{
- m_textSelection->textSelectionMove(point
, isStartedTextSelectionFromOutside
);
+ m_textSelection->textSelectionMove(point);
}
void PageClientImpl::textSelectionUp(const WebCore::IntPoint& point, bool isStartedTextSelectionFromOutside)
}
void PageClientImpl::textSelectionUp(const WebCore::IntPoint& point, bool isStartedTextSelectionFromOutside)
@@
-1298,7
+1310,7
@@
void PageClientImpl::startDrag(const DragData& dragData, PassRefPtr<ShareableBit
String dragStorageName("Drag");
m_viewImpl->page()->dragEntered(dragInfo, dragStorageName);
setDragMode(true);
String dragStorageName("Drag");
m_viewImpl->page()->dragEntered(dragInfo, dragStorageName);
setDragMode(true);
- m_drag->setDragData(dragInfo);
+ m_drag->setDragData(dragInfo
, dragImage
);
m_drag->Show();
}
#endif
m_drag->Show();
}
#endif
@@
-1394,11
+1406,6
@@
void PageClientImpl::unlockOrientation()
void PageClientImpl::didRenderFrame()
{
void PageClientImpl::didRenderFrame()
{
-#if OS(TIZEN)
- if (m_nonemptyLayoutRendered)
- ewkViewFrameRendered(m_viewImpl->view());
-#endif
-
#if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE_BACKUP_IMAGE)
if (m_shouldShowBackupTexture && m_isVisible)
m_shouldShowBackupTexture = false;
#if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE_BACKUP_IMAGE)
if (m_shouldShowBackupTexture && m_isVisible)
m_shouldShowBackupTexture = false;
@@
-1543,7
+1550,7
@@
void PageClientEvasGL::displayViewport()
void PageClientEvasGL::drawContents()
{
void PageClientEvasGL::drawContents()
{
- if (!drawingArea() || !(drawingArea()->layerTreeCoordinatorProxy()))
+ if (!drawingArea() || !(drawingArea()->layerTreeCoordinatorProxy())
|| !m_isVisible
)
return;
WebLayerTreeRenderer* renderer = drawingArea()->layerTreeCoordinatorProxy()->layerTreeRenderer();
return;
WebLayerTreeRenderer* renderer = drawingArea()->layerTreeCoordinatorProxy()->layerTreeRenderer();
@@
-1604,6
+1611,7
@@
void PageClientEvasGL::drawContents()
void PageClientEvasGL::didRenderFrame()
{
void PageClientEvasGL::didRenderFrame()
{
+ ewkViewFrameRendered(m_viewImpl->view());
PageClientImpl::didRenderFrame();
}
PageClientImpl::didRenderFrame();
}