Source/WebCore: [BlackBerry] Update BB10 form theme.

Tiancheng Jiang · webkit-commit-queue · commit 535a61660d69 · 2012-11-01T16:51:17.000Z
https://bugs.webkit.org/show_bug.cgi?id=100760 Patch by Tiancheng Jiang <tijiang@rim.com> on 2012-11-01 Reviewed by Rob Buis. RIM PR 235194. Check img pointer is null, if so, do early return. * platform/blackberry/RenderThemeBlackBerry.cpp: (WebCore::drawControl): (WebCore::drawThreeSlice): (WebCore::drawNineSlice): Source/WebKit/chromium: [Chromium] debug builds: Use after free under ~PageOverlay() https://bugs.webkit.org/show_bug.cgi?id=100930 Patch by Vsevolod Vlasov <vsevik@chromium.org> on 2012-11-01 Reviewed by Pavel Feldman. Changed members order in PageOverlay so that GraphicsLayer is destroyed before GraphicsLayerClient. * src/PageOverlay.h: (PageOverlay): Canonical link: https://commits.webkit.org/119055@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@133188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-11-01  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Update BB10 form theme.
+        https://bugs.webkit.org/show_bug.cgi?id=100760
+
+        Reviewed by Rob Buis.
+
+        RIM PR 235194.
+
+        Check img pointer is null, if so, do early return.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::drawControl):
+        (WebCore::drawThreeSlice):
+        (WebCore::drawNineSlice):
+
 2012-11-01  Adam Barth  <abarth@webkit.org>
 
         [V8] The V8DOMMap visitors are no longer needed
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2012-11-01  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        [Chromium] debug builds: Use after free under ~PageOverlay()
+        https://bugs.webkit.org/show_bug.cgi?id=100930
+
+        Reviewed by Pavel Feldman.
+
+        Changed members order in PageOverlay so that GraphicsLayer is destroyed before GraphicsLayerClient.
+
+        * src/PageOverlay.h:
+        (PageOverlay):
+
 2012-11-01  James Robinson  <jamesr@chromium.org>
 
         [chromium] Avoid attempting to defer commits when they are already deferred
diff --git a/Source/WebKit/chromium/src/PageOverlay.h b/Source/WebKit/chromium/src/PageOverlay.h
@@ -65,8 +65,8 @@ class PageOverlay {
 
     WebViewImpl* m_viewImpl;
     WebPageOverlay* m_overlay;
-    OwnPtr<WebCore::GraphicsLayer> m_layer;
     OwnPtr<WebCore::GraphicsLayerClient> m_layerClient;
+    OwnPtr<WebCore::GraphicsLayer> m_layer;
     int m_zOrder;
 };
 
