5.1.0

reswitched · May 31, 2018 · 48ac7ad · 48ac7ad
1 parent 1c3814e
commit 48ac7ad
Show file tree

Hide file tree

Showing 100 changed files with 1,723 additions and 232 deletions.
diff --git a/NetFrontBrowserNX_OSSCopyright.txt b/NetFrontBrowserNX_OSSCopyright.txt
@@ -1,3 +1,3 @@
 OSS Copyright of NetFront Browser NX
-Copyright (c) 2015-2017 ACCESS CO., LTD. All rights reserved.
+Copyright (c) 2015-2018 ACCESS CO., LTD. All rights reserved.
 Some files in this package were modified by ACCESS CO., LTD.
diff --git a/WKC/WebCore/platform/network/WKC/SocketStreamHandle.h b/WKC/WebCore/platform/network/WKC/SocketStreamHandle.h
@@ -66,8 +66,6 @@ namespace WebCore {
         };
         int socketState() const { return m_socketState; }
 
-        bool isConstructed() const { return m_constructed; }
-
     protected:
         virtual int platformSend(const char* data, int length);
         virtual void platformClose();
@@ -89,8 +87,6 @@ namespace WebCore {
         void progressTimerFired();
 
     private:
-        bool m_constructed;
-
         bool m_needClosing;
         bool m_clientCallingFromTimer;
 

diff --git a/WKC/WebCore/platform/network/WKC/SocketStreamHandleWKC.cpp b/WKC/WebCore/platform/network/WKC/SocketStreamHandleWKC.cpp
@@ -64,7 +64,6 @@ namespace WebCore {
 
 SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client, NetworkingContext& networkingContext)
     : SocketStreamHandleBase(url, client)
-    , m_constructed(false)
     , m_clientCallingFromTimer(false)
     , m_needClosing(false)
     , m_socketState(None)
@@ -283,10 +282,8 @@ void SocketStreamHandle::construct(void)
 
     m_socketState = Initialized;
 
-    m_constructed = true;
-
 construct_end:
-    if (m_constructed && m_socketState == Initialized) {
+    if (m_socketState==Initialized) {
         if (m_client)
             m_client->willOpenSocketStream(this);
     }
@@ -328,7 +325,7 @@ SocketStreamHandle::progressTimerFired()
 
     _LOG(Network, "SocketStreamHandle %p progressTimerFired", this);
 
-    if (!m_constructed || m_socketState == None) {
+    if (m_socketState==None) {
         if (m_client) {
             m_client->didFailSocketStream(this, SocketStreamError(-1));
             m_client->didCloseSocketStream(this);
@@ -470,7 +467,7 @@ int SocketStreamHandle::platformSend(const char* data, int len)
 {
     _LOG(Network, "SocketStreamHandle %p platformSend(%p, %d), state=%d", this, data, len, m_state);
 
-    if (!m_constructed || Open != m_state || !m_handle || !m_multiHandle || m_socket < 0) {
+    if (Open != m_state || !m_handle || !m_multiHandle || m_socket < 0) {
         if (m_client)
             m_client->didFailSocketStream(this, SocketStreamError(-1));
         return -1;
@@ -537,7 +534,7 @@ void SocketStreamHandle::platformClose()
 {
     _LOG(Network, "SocketStreamHandle %p platformClose()", this);
 
-    if (!m_constructed || !m_handle || !m_multiHandle) {
+    if (!m_handle || !m_multiHandle) {
         return;
     }
 

diff --git a/WKC/WebKit/WKC/helpers/privates/WKCNode.cpp b/WKC/WebKit/WKC/helpers/privates/WKCNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 ACCESS CO., LTD. All rights reserved.
+ * Copyright (c) 2011-2018 ACCESS CO., LTD. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -476,8 +476,16 @@ NodePrivate::isScrollableOverFlowBlockNode() const
 void
 NodePrivate::getNodeCompositeRect(WKCRect* rect, int tx, int ty)
 {
+    WebCore::RenderObject* renderer = m_webcore->renderer();
+    if (!renderer)
+        return;
+
+    WebCore::RenderStyle& style = renderer->style();
+    bool isOverflowXHidden = (style.overflowX() == WebCore::OHIDDEN);
+    bool isOverflowYHidden = (style.overflowY() == WebCore::OHIDDEN);
+
     WebCore::LayoutRect core_rect = WebCore::LayoutRect(rect->fX, rect->fY, rect->fWidth, rect->fHeight);
-    m_webcore->getNodeCompositeRect(&core_rect, tx, ty);
+    m_webcore->getNodeCompositeRect(&core_rect, isOverflowXHidden, isOverflowYHidden, tx, ty);
     rect->fX = core_rect.x();
     rect->fY = core_rect.y();
     rect->fWidth = core_rect.width();

diff --git a/WKC/WebKit/WKC/webkit/WKCVersion.h b/WKC/WebKit/WKC/webkit/WKCVersion.h
@@ -29,7 +29,7 @@
 #define WKC_VERSION_CHECK(major, minor, micro) \
     (((major)*10000) + ((minor)*100) + (micro)) >= ((WKC_VERSION_MAJOR*10000) + (WKC_VERSION_MINOR*100) + (WKC_VERSION_MICRO))
 
-#define WKC_CUSTOMER_RELEASE_VERSION "0.8.9"
+#define WKC_CUSTOMER_RELEASE_VERSION "0.9.3"
 
 #define WKC_WEBKIT_VERSION "601.6"
 

diff --git a/WKC/WebKit/WKC/webkit/WKCWebView.cpp b/WKC/WebKit/WKC/webkit/WKCWebView.cpp
@@ -1748,6 +1748,15 @@ WKCWebView::notifyMouseMoveTest(const WKCPoint& pos, WKC::MouseButton button, Mo
 
     result = notifyMouseMove(pos, button, modifiers);
 
+    renderer = targetNode->renderer();
+
+    if (!renderer) {
+        // Since the renderer has been deleted, there is a possibility that the appearance of the content has changed,
+        // but in this case, we do not consider it to be a change for a mouse over menu.
+        contentChanged = false;
+        goto exit;
+    }
+
     renderer->frame().document()->updateStyleIfNeeded();
 
     renderer = targetNode->renderer();

diff --git a/WKC/include/wkccairorename.h b/WKC/include/wkccairorename.h
@@ -327,14 +327,14 @@
 #define _cairo_image_surface_unmap_image wkc__cairo_image_surface_unmap_image
 #define _cairo_image_traps_compositor_get wkc__cairo_image_traps_compositor_get
 #define _cairo_init wkc__cairo_init
+#define _cairo_int_96by64_32x64_divrem wkc__cairo_int_96by64_32x64_divrem
+#define _cairo_int_surface_create_in_error wkc__cairo_int_surface_create_in_error
 #define _cairo_int128_cmp wkc__cairo_int128_cmp
 #define _cairo_int128_divrem wkc__cairo_int128_divrem
 #define _cairo_int128_lt wkc__cairo_int128_lt
 #define _cairo_int32_to_int128 wkc__cairo_int32_to_int128
 #define _cairo_int64_to_int128 wkc__cairo_int64_to_int128
 #define _cairo_int64x64_128_mul wkc__cairo_int64x64_128_mul
-#define _cairo_int_96by64_32x64_divrem wkc__cairo_int_96by64_32x64_divrem
-#define _cairo_int_surface_create_in_error wkc__cairo_int_surface_create_in_error
 #define _cairo_intern_string wkc__cairo_intern_string
 #define _cairo_intern_string_mutex wkc__cairo_intern_string_mutex
 #define _cairo_intern_string_reset_static_data wkc__cairo_intern_string_reset_static_data
@@ -673,10 +673,10 @@
 #define _cairo_time_from_s wkc__cairo_time_from_s
 #define _cairo_time_get wkc__cairo_time_get
 #define _cairo_time_to_s wkc__cairo_time_to_s
-#define _cairo_tor22_scan_converter_add_polygon wkc__cairo_tor22_scan_converter_add_polygon
-#define _cairo_tor22_scan_converter_create wkc__cairo_tor22_scan_converter_create
 #define _cairo_tor_scan_converter_add_polygon wkc__cairo_tor_scan_converter_add_polygon
 #define _cairo_tor_scan_converter_create wkc__cairo_tor_scan_converter_create
+#define _cairo_tor22_scan_converter_add_polygon wkc__cairo_tor22_scan_converter_add_polygon
+#define _cairo_tor22_scan_converter_create wkc__cairo_tor22_scan_converter_create
 #define _cairo_toy_font_face_mutex wkc__cairo_toy_font_face_mutex
 #define _cairo_toy_font_face_reset_static_data wkc__cairo_toy_font_face_reset_static_data
 #define _cairo_trapezoid_array_translate_and_scale wkc__cairo_trapezoid_array_translate_and_scale
@@ -709,6 +709,7 @@
 #define _cairo_twin_outlines wkc__cairo_twin_outlines
 #define _cairo_ucs4_to_utf16 wkc__cairo_ucs4_to_utf16
 #define _cairo_ucs4_to_utf8 wkc__cairo_ucs4_to_utf8
+#define _cairo_uint_96by64_32x64_divrem wkc__cairo_uint_96by64_32x64_divrem
 #define _cairo_uint128_add wkc__cairo_uint128_add
 #define _cairo_uint128_cmp wkc__cairo_uint128_cmp
 #define _cairo_uint128_divrem wkc__cairo_uint128_divrem
@@ -724,7 +725,6 @@
 #define _cairo_uint32_to_uint128 wkc__cairo_uint32_to_uint128
 #define _cairo_uint64_to_uint128 wkc__cairo_uint64_to_uint128
 #define _cairo_uint64x64_128_mul wkc__cairo_uint64x64_128_mul
-#define _cairo_uint_96by64_32x64_divrem wkc__cairo_uint_96by64_32x64_divrem
 #define _cairo_unbounded_rectangle wkc__cairo_unbounded_rectangle
 #define _cairo_unscaled_font_destroy wkc__cairo_unscaled_font_destroy
 #define _cairo_unscaled_font_init wkc__cairo_unscaled_font_init
@@ -738,7 +738,6 @@
 #define _cairo_user_font_face_backend wkc__cairo_user_font_face_backend
 #define _cairo_utf8_get_char_validated wkc__cairo_utf8_get_char_validated
 #define _cairo_utf8_to_ucs4 wkc__cairo_utf8_to_ucs4
-#define _cairo_utf8_to_utf16 wkc__cairo_utf8_to_utf16
 #define _cairo_validate_text_clusters wkc__cairo_validate_text_clusters
 #define _do_cairo_gstate_backend_to_user wkc__do_cairo_gstate_backend_to_user
 #define _do_cairo_gstate_backend_to_user_distance wkc__do_cairo_gstate_backend_to_user_distance
@@ -960,8 +959,8 @@
 #define cairo_rel_curve_to wkc_cairo_rel_curve_to
 #define cairo_rel_line_to wkc_cairo_rel_line_to
 #define cairo_rel_move_to wkc_cairo_rel_move_to
-#define cairo_resetVariables wkc_cairo_resetVariables
 #define cairo_reset_clip wkc_cairo_reset_clip
+#define cairo_resetVariables wkc_cairo_resetVariables
 #define cairo_restore wkc_cairo_restore
 #define cairo_rotate wkc_cairo_rotate
 #define cairo_save wkc_cairo_save

diff --git a/src/NX-NXFP2-a32/rocrt.AssemblyOffset.h b/src/NX-NXFP2-a32/rocrt.AssemblyOffset.h
@@ -22,4 +22,4 @@
 // NOLINT(build/header_guard)
 
 #define NN_ROCRT_MODULE_HEADER_VERSION 0x30444f4d // NOLINT(readability/define)
-#define NN_ROCRT_ROMODULE_SIZE 0x5c // NOLINT(readability/define)
+#define NN_ROCRT_ROMODULE_SIZE 0x64 // NOLINT(readability/define)
diff --git a/src/NX-NXFP2-a64/rocrt.AssemblyOffset.h b/src/NX-NXFP2-a64/rocrt.AssemblyOffset.h
@@ -22,4 +22,4 @@
 // NOLINT(build/header_guard)
 
 #define NN_ROCRT_MODULE_HEADER_VERSION 0x30444f4d // NOLINT(readability/define)
-#define NN_ROCRT_ROMODULE_SIZE 0xb8 // NOLINT(readability/define)
+#define NN_ROCRT_ROMODULE_SIZE 0xc8 // NOLINT(readability/define)