Title: [148427] trunk
- Revision
- 148427
- Author
- commit-qu...@webkit.org
- Date
- 2013-04-15 03:50:59 -0700 (Mon, 15 Apr 2013)
Log Message
[BlackBerry] ASSERT in StyleResolver::ensureScopeResolver()
https://bugs.webkit.org/show_bug.cgi?id=114615
Patch by Xan Lopez <xlo...@igalia.com> on 2013-04-15
Reviewed by Carlos Garcia Campos.
Source/WebKit/blackberry:
Add a method to enable the style scoped feature to our
DumpRenderTreeSupport class.
* WebKitSupport/DumpRenderTreeSupport.cpp:
(DumpRenderTreeSupport::setStyleScopedEnabled):
* WebKitSupport/DumpRenderTreeSupport.h:
(DumpRenderTreeSupport):
Tools:
Enable the style scoped feature if we have support for it.
* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148426 => 148427)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-15 10:36:49 UTC (rev 148426)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-15 10:50:59 UTC (rev 148427)
@@ -1,3 +1,18 @@
+2013-04-15 Xan Lopez <xlo...@igalia.com>
+
+ [BlackBerry] ASSERT in StyleResolver::ensureScopeResolver()
+ https://bugs.webkit.org/show_bug.cgi?id=114615
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add a method to enable the style scoped feature to our
+ DumpRenderTreeSupport class.
+
+ * WebKitSupport/DumpRenderTreeSupport.cpp:
+ (DumpRenderTreeSupport::setStyleScopedEnabled):
+ * WebKitSupport/DumpRenderTreeSupport.h:
+ (DumpRenderTreeSupport):
+
2013-04-12 Yongxin Dai <yo...@rim.com>
[BlackBerry] Enable selecting text in single line input field without selection point being actually on the targeted text vertically
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp (148426 => 148427)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2013-04-15 10:36:49 UTC (rev 148426)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2013-04-15 10:50:59 UTC (rev 148427)
@@ -31,6 +31,7 @@
#include "JSCSSStyleDeclaration.h"
#include "JSElement.h"
#include "Page.h"
+#include "RuntimeEnabledFeatures.h"
#include "WebPage_p.h"
#include "bindings/js/GCController.h"
#include <_javascript_Core/APICast.h>
@@ -121,6 +122,13 @@
corePage(webPage)->setPageScaleFactor(scaleFactor, IntPoint(x, y));
}
+#if ENABLE(STYLE_SCOPED)
+void DumpRenderTreeSupport::setStyleScopedEnabled(bool enabled)
+{
+ RuntimeEnabledFeatures::setStyleScopedEnabled(enabled);
+}
+#endif
+
#if ENABLE(DEVICE_ORIENTATION)
DeviceOrientationClientMock* toDeviceOrientationClientMock(DeviceOrientationClient* client)
{
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h (148426 => 148427)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h 2013-04-15 10:36:49 UTC (rev 148426)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.h 2013-04-15 10:50:59 UTC (rev 148427)
@@ -58,6 +58,9 @@
static void setMockGeolocationPosition(BlackBerry::WebKit::WebPage*, double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed);
static void setMockDeviceOrientation(BlackBerry::WebKit::WebPage*, bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma);
static void scalePageBy(BlackBerry::WebKit::WebPage*, float, float, float);
+#if ENABLE(STYLE_SCOPED)
+ static void setStyleScopedEnabled(bool);
+#endif
private:
static bool s_linksIncludedInTabChain;
Modified: trunk/Tools/ChangeLog (148426 => 148427)
--- trunk/Tools/ChangeLog 2013-04-15 10:36:49 UTC (rev 148426)
+++ trunk/Tools/ChangeLog 2013-04-15 10:50:59 UTC (rev 148427)
@@ -1,3 +1,15 @@
+2013-04-15 Xan Lopez <xlo...@igalia.com>
+
+ [BlackBerry] ASSERT in StyleResolver::ensureScopeResolver()
+ https://bugs.webkit.org/show_bug.cgi?id=114615
+
+ Reviewed by Carlos Garcia Campos.
+
+ Enable the style scoped feature if we have support for it.
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
2013-04-15 Allan Sandfeld Jensen <allan.jen...@digia.com>
[Qt] QtMultimedia not used when GStreamer is not found
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (148426 => 148427)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-04-15 10:36:49 UTC (rev 148426)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-04-15 10:50:59 UTC (rev 148427)
@@ -324,6 +324,9 @@
setAcceptsEditing(true);
DumpRenderTreeSupport::setLinksIncludedInFocusChain(true);
+#if ENABLE(STYLE_SCOPED)
+ DumpRenderTreeSupport::setStyleScopedEnabled(true);
+#endif
m_page->setVirtualViewportSize(Platform::IntSize(800, 600));
m_page->resetVirtualViewportOnCommitted(false);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
