Merge "[WK2] Small Caps font variant issue for Italic fonts" into tizen_2.2

diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
index 3a69367..4f82429 100644 (file)
--- a/Source/WTF/wtf/Assertions.cpp
+++ b/Source/WTF/wtf/Assertions.cpp
@@ -465,7 +465,7 @@ void TizenLog(TizenDlogPriority priority, bool secureLog, int line, const char*
     switch (priority) {
     case TIZEN_DLOG_PRIORITY_INFO:
         snprintf(logFormat, DLOG_MAX_LENGTH, "%s(%d) > %s%s", function, line, secureLogTag, format);
-        LOG_VA(LOG_INFO, DLOG_WEBKIT_TAG, logFormat, args);
+        LOG_VA(LOG_DEBUG, DLOG_WEBKIT_TAG, logFormat, args);
         break;
     case TIZEN_DLOG_PRIORITY_ERROR:
         snprintf(logFormat, DLOG_MAX_LENGTH, "%s(%d) > %sERROR: %s", function, line, secureLogTag, format);

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index 0c28a54..b9d11a1 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@ -1550,7 +1550,7 @@ void PageClientEvasGL::displayViewport()
 
 void PageClientEvasGL::drawContents()
 {
-    if (!drawingArea() || !(drawingArea()->layerTreeCoordinatorProxy()))
+    if (!drawingArea() || !(drawingArea()->layerTreeCoordinatorProxy()) || !m_isVisible)
         return;
 
     WebLayerTreeRenderer* renderer = drawingArea()->layerTreeCoordinatorProxy()->layerTreeRenderer();

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 531af36..76bb510 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -1,6 +1,6 @@
 SET(PROJECT_VERSION_MAJOR 0)
 SET(PROJECT_VERSION_MINOR 11)
-SET(PROJECT_VERSION_PATCH 80)
+SET(PROJECT_VERSION_PATCH 81)
 SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 # -----------------------------------------------------------------------------

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 9087daf..8d0c383 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -1,6 +1,6 @@
 Name: webkit2-efl
 Summary: Webkit2 EFL
-Version: 123997_0.11.80
+Version: 123997_0.11.81
 Release: 1
 Group: Applications/Internet
 License: LGPLv2.1 or BSD