Internet Browser: Difference between revisions
Added OSS diffs for v10.2. |
|||
Line 176: | Line 176: | ||
/static.crs differ | /static.crs differ | ||
/webkit.cro.lex differ | /webkit.cro.lex differ | ||
OSS diff: | |||
diff --git a/NewNintendo3DS_OpenSources9.9.0-/WKC/WebKit/WKC/webkit/WKCVersion.h b/NewNintendo3DS_OpenSources10.2.0-/WKC/WebKit/WKC/webkit/WKCVersion.h | |||
index 4543297..0860336 100644 | |||
--- a/NewNintendo3DS_OpenSources9.9.0-/WKC/WebKit/WKC/webkit/WKCVersion.h | |||
+++ b/NewNintendo3DS_OpenSources10.2.0-/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.5.15" | |||
+#define WKC_CUSTOMER_RELEASE_VERSION "0.5.17" | |||
#define WKC_WEBKIT_VERSION "536.30" | |||
diff --git a/NewNintendo3DS_OpenSources9.9.0-/webkit/WebCore/ChangeLog b/NewNintendo3DS_OpenSources10.2.0-/webkit/WebCore/ChangeLog | |||
index a5abb35..cf5a9fa 100644 | |||
--- a/NewNintendo3DS_OpenSources9.9.0-/webkit/WebCore/ChangeLog | |||
+++ b/NewNintendo3DS_OpenSources10.2.0-/webkit/WebCore/ChangeLog | |||
@@ -1,3 +1,12 @@ | |||
+2013-11-05 Ryosuke Niwa <rniwa@webkit.org> | |||
+ | |||
+ Use-after-free in SliderThumbElement::dragFrom | |||
+ https://bugs.webkit.org/show_bug.cgi?id=123873 | |||
+ | |||
+ Reviewed by Andreas Kling. | |||
+ | |||
+ Merge https://chromium.googlesource.com/chromium/blink/+/04a23bfca2d04101a1828d36ff36c29f3a24f34b | |||
+ | |||
2015-02-06 Maciej Stachowiak <mjs@apple.com> | |||
REGRESSION(r179706): Caused memory corruption on some tests (Requested by _ap_ on #webkit). | |||
@@ -879,7 +888,7 @@ | |||
* rendering/RenderLineBoxList.cpp: | |||
(WebCore::RenderLineBoxList::dirtyLinesFromChangedChild): | |||
-2014-01-21 László Langó <llango.u-szeged@partner.samsung.com> | |||
+2014-01-21 Laszlo Lango <llango.u-szeged@partner.samsung.com> | |||
Assertion failure in Range::nodeWillBeRemoved | |||
https://bugs.webkit.org/show_bug.cgi?id=121694 | |||
@@ -1879,7 +1888,7 @@ | |||
2012-09-14 Simon Fraser <simon.fraser@apple.com> | |||
- REGRESSION: transition doesnât always override transition-property | |||
+ REGRESSION: transition doesnft always override transition-property | |||
https://bugs.webkit.org/show_bug.cgi?id=96658 | |||
Reviewed by Dean Jackson. | |||
@@ -3691,8 +3700,8 @@ | |||
glyph with font data for the primary font, presumably to meet the SVG | |||
spec requirement: "If the references to alternate glyphs do not result | |||
in successful identification of alternate glyphs to use, then the | |||
- character(s) that are inside of the 窶åltGlyph窶?element are rendered as | |||
- if the 窶åltGlyph窶?element were a 窶?span窶?element instead." | |||
+ character(s) that are inside of the âaltGlyphâ?element are rendered as | |||
+ if the âaltGlyphâ?element were a â?spanâ?element instead." | |||
If the alt glyph is not then found we are in the case from the spec | |||
and indeed we should use the primary font. However, we end up replacing the GlyphPage | |||
diff --git a/NewNintendo3DS_OpenSources9.9.0-/webkit/WebCore/html/RangeInputType.cpp b/NewNintendo3DS_OpenSources10.2.0-/webkit/WebCore/html/RangeInputType.cpp | |||
index 484adec..d7e9e8d 100644 | |||
--- a/NewNintendo3DS_OpenSources9.9.0-/webkit/WebCore/html/RangeInputType.cpp | |||
+++ b/NewNintendo3DS_OpenSources10.2.0-/webkit/WebCore/html/RangeInputType.cpp | |||
@@ -164,7 +164,7 @@ void RangeInputType::handleMouseDownEvent(MouseEvent* event) | |||
ASSERT(element()->hasShadowRoot()); | |||
if (targetNode != element() && !targetNode->isDescendantOf(element()->shadowTree()->oldestShadowRoot())) | |||
return; | |||
- SliderThumbElement* thumb = sliderThumbElementOf(element()); | |||
+ RefPtr<SliderThumbElement> thumb = sliderThumbElementOf(element()); | |||
if (targetNode == thumb) | |||
return; | |||
thumb->dragFrom(event->absoluteLocation()); | |||
=== New3DS Browser Specifications === | === New3DS Browser Specifications === | ||
Line 358: | Line 432: | ||
/cro/webkit.cro | /cro/webkit.cro | ||
/.crr/static.crr | /.crr/static.crr | ||
OSS diff: | |||
diff --git a/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_9.9.0/WKC/WebKit/WKC/webkit/WKCVersion.h b/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_10.2.0/WKC/WebKit/WKC/webkit/WKCVersion.h | |||
index 55a7274..fc153c4 100644 | |||
--- a/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_9.9.0/WKC/WebKit/WKC/webkit/WKCVersion.h | |||
+++ b/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_10.2.0/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 "1.8.16" | |||
+#define WKC_CUSTOMER_RELEASE_VERSION "1.8.17" | |||
#define WKC_WEBKIT_VERSION "532.7" | |||
diff --git a/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_9.9.0/webkit/WebCore/rendering/RenderSlider.cpp b/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_10.2.0/webkit/WebCore/rendering/RenderSlider.cpp | |||
index b2f5cef..1dd3dbd 100644 | |||
--- a/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_9.9.0/webkit/WebCore/rendering/RenderSlider.cpp | |||
+++ b/3DS_InternetBrowser_OpenSources_JP_US_EU_KR_TW_HK_CN_10.2.0/webkit/WebCore/rendering/RenderSlider.cpp | |||
@@ -221,6 +221,7 @@ RenderSlider::~RenderSlider() | |||
{ | |||
if (m_thumb) | |||
m_thumb->detach(); | |||
+ m_thumb = 0; | |||
} | |||
int RenderSlider::baselinePosition(bool, bool) const | |||
@@ -493,7 +494,8 @@ void RenderSlider::forwardEvent(Event* event) | |||
} | |||
} | |||
- m_thumb->defaultEventHandler(event); | |||
+ if (m_thumb) | |||
+ m_thumb->defaultEventHandler(event); | |||
} | |||
bool RenderSlider::inDragMode() const | |||
== Forced system-update == | == Forced system-update == |