date:20110930

[webkit-changes] [96393] trunk/Source/WebCore

2011-09-30 Thread antti

Title: [96393] trunk/Source/WebCore








Revision 96393
Author an...@apple.com
Date 2011-09-30 00:07:17 -0700 (Fri, 30 Sep 2011)


Log Message
https://bugs.webkit.org/show_bug.cgi?id=69106
Universal attribute selectors disable style sharing

Reviewed by Dave Hyatt.

Selectors of type [foo=bar] ended up marking every element style with the affectedByAttributeSelectors bit
rendering style sharing inoperative. This happens on http://www.whatwg.org/specs/web-apps/current-work/ for example.

Instead we now mark style with affectedByUncommonAttributeSelectors bit only if an attribute selector actually 
matches the element. Before sharing, we also check the current element against collected attribute rules.
We can share the style if neither element was affected.

This speeds up style matching and applying ~15% on full HTML5 spec (=~0.7s). Sharing percentage goes from 0% to ~30%.
Increased sharing should also save a substantial amount of memory.

* css/CSSSelector.h:
(WebCore::CSSSelector::isAttributeSelector):
* css/CSSStyleSelector.cpp:
(WebCore::RuleData::containsUncommonAttributeSelector):
(WebCore::collectSpecialRulesInDefaultStyle):
(WebCore::assertNoSiblingRulesInDefaultStyle):
(WebCore::CSSStyleSelector::CSSStyleSelector):
(WebCore::CSSStyleSelector::matchRules):
(WebCore::CSSStyleSelector::matchesRuleSet):
(WebCore::CSSStyleSelector::canShareStyleWithElement):
(WebCore::CSSStyleSelector::locateSharedStyle):
(WebCore::CSSStyleSelector::styleForElement):
(WebCore::selectorListContainsUncommonAttributeSelector):
(WebCore::isCommonAttributeSelectorAttribute):
(WebCore::containsUncommonAttributeSelector):
(WebCore::RuleData::RuleData):
(WebCore::collectFeaturesFromSelector):
(WebCore::collectFeaturesFromList):
* css/CSSStyleSelector.h:
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOneSelector):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::RenderStyle):
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::affectedByUncommonAttributeSelectors):
(WebCore::InheritedFlags::setAffectedByUncommonAttributeSelectors):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSSelector.h
trunk/Source/WebCore/css/CSSStyleSelector.cpp
trunk/Source/WebCore/css/CSSStyleSelector.h
trunk/Source/WebCore/css/SelectorChecker.cpp
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
trunk/Source/WebCore/rendering/style/RenderStyle.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (96392 => 96393)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 07:05:19 UTC (rev 96392)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 07:07:17 UTC (rev 96393)
@@ -1,3 +1,47 @@
+2011-09-29  Antti Koivisto  an...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=69106
+Universal attribute selectors disable style sharing
+
+Reviewed by Dave Hyatt.
+
+Selectors of type [foo=bar] ended up marking every element style with the affectedByAttributeSelectors bit
+rendering style sharing inoperative. This happens on http://www.whatwg.org/specs/web-apps/current-work/ for example.
+
+Instead we now mark style with affectedByUncommonAttributeSelectors bit only if an attribute selector actually 
+matches the element. Before sharing, we also check the current element against collected attribute rules.
+We can share the style if neither element was affected.
+
+This speeds up style matching and applying ~15% on full HTML5 spec (=~0.7s). Sharing percentage goes from 0% to ~30%.
+Increased sharing should also save a substantial amount of memory.
+
+* css/CSSSelector.h:
+(WebCore::CSSSelector::isAttributeSelector):
+* css/CSSStyleSelector.cpp:
+(WebCore::RuleData::containsUncommonAttributeSelector):
+(WebCore::collectSpecialRulesInDefaultStyle):
+(WebCore::assertNoSiblingRulesInDefaultStyle):
+(WebCore::CSSStyleSelector::CSSStyleSelector):
+(WebCore::CSSStyleSelector::matchRules):
+(WebCore::CSSStyleSelector::matchesRuleSet):
+(WebCore::CSSStyleSelector::canShareStyleWithElement):
+(WebCore::CSSStyleSelector::locateSharedStyle):
+(WebCore::CSSStyleSelector::styleForElement):
+(WebCore::selectorListContainsUncommonAttributeSelector):
+(WebCore::isCommonAttributeSelectorAttribute):
+(WebCore::containsUncommonAttributeSelector):
+(WebCore::RuleData::RuleData):
+(WebCore::collectFeaturesFromSelector):
+(WebCore::collectFeaturesFromList):
+* css/CSSStyleSelector.h:
+* css/SelectorChecker.cpp:
+(WebCore::SelectorChecker::checkOneSelector):
+* rendering/style/RenderStyle.cpp:
+(WebCore::RenderStyle::RenderStyle):
+* rendering/style/RenderStyle.h:
+(WebCore::InheritedFlags::affectedByUncommonAttributeSelectors):
+(WebCore::InheritedFlags::setAffectedByUncommonAttributeSelectors):
+
 2011-09-30  James Robinson

[webkit-changes] [96395] trunk/Source

2011-09-30 Thread mrowe

Title: [96395] trunk/Source








Revision 96395
Author mr...@apple.com
Date 2011-09-30 00:14:12 -0700 (Fri, 30 Sep 2011)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/_javascript_Glue/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebKit/mac/Configurations/Version.xcconfig
trunk/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (96394 => 96395)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2011-09-30 07:12:47 UTC (rev 96394)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2011-09-30 07:14:12 UTC (rev 96395)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 535;
-MINOR_VERSION = 5;
+MINOR_VERSION = 6;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/_javascript_Glue/Configurations/Version.xcconfig (96394 => 96395)

--- trunk/Source/_javascript_Glue/Configurations/Version.xcconfig	2011-09-30 07:12:47 UTC (rev 96394)
+++ trunk/Source/_javascript_Glue/Configurations/Version.xcconfig	2011-09-30 07:14:12 UTC (rev 96395)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 535;
-MINOR_VERSION = 5;
+MINOR_VERSION = 6;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (96394 => 96395)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2011-09-30 07:12:47 UTC (rev 96394)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2011-09-30 07:14:12 UTC (rev 96395)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 535;
-MINOR_VERSION = 5;
+MINOR_VERSION = 6;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (96394 => 96395)

--- trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2011-09-30 07:12:47 UTC (rev 96394)
+++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2011-09-30 07:14:12 UTC (rev 96395)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 535;
-MINOR_VERSION = 5;
+MINOR_VERSION = 6;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (96394 => 96395)

--- trunk/Source/WebKit2/Configurations/Version.xcconfig	2011-09-30 07:12:47 UTC (rev 96394)
+++ trunk/Source/WebKit2/Configurations/Version.xcconfig	2011-09-30 07:14:12 UTC (rev 96395)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 535;
-MINOR_VERSION = 5;
+MINOR_VERSION = 6;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96396] trunk/LayoutTests

2011-09-30 Thread hamaji

Title: [96396] trunk/LayoutTests








Revision 96396
Author ham...@chromium.org
Date 2011-09-30 01:00:28 -0700 (Fri, 30 Sep 2011)


Log Message
[Chromium] Layout Test fast/frames/frame-set-rotation-hit.html and fast/frames/frame-set-scaling-hit.html are failing
https://bugs.webkit.org/show_bug.cgi?id=69136

Unreviewed test_expectations.txt update

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96395 => 96396)

--- trunk/LayoutTests/ChangeLog	2011-09-30 07:14:12 UTC (rev 96395)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 08:00:28 UTC (rev 96396)
@@ -1,3 +1,12 @@
+2011-09-30  Shinichiro Hamaji  ham...@chromium.org
+
+[Chromium] Layout Test fast/frames/frame-set-rotation-hit.html and fast/frames/frame-set-scaling-hit.html are failing
+https://bugs.webkit.org/show_bug.cgi?id=69136
+
+Unreviewed test_expectations.txt update
+
+* platform/chromium/test_expectations.txt:
+
 2011-09-29  Shinichiro Hamaji  ham...@chromium.org
 
 [Chromium] Layout Test platform/chromium/compositing/3d-corners.html is failing


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (96395 => 96396)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-30 07:14:12 UTC (rev 96395)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-30 08:00:28 UTC (rev 96396)
@@ -3851,3 +3851,6 @@
 
 BUGWK69124 WIN LINUX GPU : platform/chromium/compositing/3d-corners.html = TEXT
 
+BUGWK69136 MAC SNOWLEOPARD : fast/frames/frame-set-rotation-hit.html = IMAGE
+BUGWK69136 MAC SNOWLEOPARD : fast/frames/frame-set-scaling-hit.html = IMAGE
+






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96397] trunk/LayoutTests

2011-09-30 Thread hamaji

Title: [96397] trunk/LayoutTests








Revision 96397
Author ham...@chromium.org
Date 2011-09-30 01:07:01 -0700 (Fri, 30 Sep 2011)


Log Message
[Chromium] Layout test failures under Snow Leopard
https://bugs.webkit.org/show_bug.cgi?id=54322

Unreviewed test_expectations.txt update. acid3 seems to be IMAGE+TEXT, not IMAGE

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96396 => 96397)

--- trunk/LayoutTests/ChangeLog	2011-09-30 08:00:28 UTC (rev 96396)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 08:07:01 UTC (rev 96397)
@@ -1,5 +1,14 @@
 2011-09-30  Shinichiro Hamaji  ham...@chromium.org
 
+[Chromium] Layout test failures under Snow Leopard
+https://bugs.webkit.org/show_bug.cgi?id=54322
+
+Unreviewed test_expectations.txt update. acid3 seems to be IMAGE+TEXT, not IMAGE
+
+* platform/chromium/test_expectations.txt:
+
+2011-09-30  Shinichiro Hamaji  ham...@chromium.org
+
 [Chromium] Layout Test fast/frames/frame-set-rotation-hit.html and fast/frames/frame-set-scaling-hit.html are failing
 https://bugs.webkit.org/show_bug.cgi?id=69136
 


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (96396 => 96397)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-30 08:00:28 UTC (rev 96396)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-09-30 08:07:01 UTC (rev 96397)
@@ -2682,7 +2682,7 @@
 BUGWK54322 SNOWLEOPARD : fast/text/international/pop-up-button-text-alignment-and-direction.html = IMAGE
 BUGWK54322 SNOWLEOPARD : fast/text/international/text-combine-image-test.html = IMAGE
 BUGWK54322 SNOWLEOPARD : fonts/monospace.html = IMAGE
-BUGWK54322 SNOWLEOPARD : http/tests/misc/acid3.html = IMAGE // See SVG tests section too
+BUGWK54322 SNOWLEOPARD : http/tests/misc/acid3.html = IMAGE+TEXT // See SVG tests section too
 BUGWK54322 SNOWLEOPARD : svg/custom/animate-path-discrete.svg = IMAGE
 BUGWK54322 SNOWLEOPARD : svg/W3C-SVG-1.1/coords-viewattr-01-b.svg = IMAGE+TEXT
 BUGWK54322 SNOWLEOPARD : svg/zoom/text/zoom-coords-viewattr-01-b.svg = IMAGE+TEXT






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96399] trunk/Source/WebKit2

2011-09-30 Thread commit-queue

Title: [96399] trunk/Source/WebKit2








Revision 96399
Author commit-qu...@webkit.org
Date 2011-09-30 04:58:30 -0700 (Fri, 30 Sep 2011)


Log Message
[Qt][WK2] Event delivery in QDesktopWebView is broken after merge of Qt5 refactor
https://bugs.webkit.org/show_bug.cgi?id=69105

This changes QDesktopWebView and QDesktopWebPageProxy to use QMouseEvent instead
of QGraphicsSceneMouseEvent.
Further it removes an endless loop introduced by the QSGItem::event() function
delivering inputMethodEvents but no other events.

Patch by Zeno Albisser zeno.albis...@nokia.com on 2011-09-30
Reviewed by Andreas Kling.

* Shared/NativeWebMouseEvent.h:
(WebKit::NativeWebMouseEvent::nativeEvent):
* Shared/NativeWebWheelEvent.h:
(WebKit::NativeWebWheelEvent::nativeEvent):
* Shared/qt/NativeWebMouseEventQt.cpp:
(WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
* Shared/qt/NativeWebWheelEventQt.cpp:
(WebKit::NativeWebWheelEvent::NativeWebWheelEvent):
* Shared/qt/WebEventFactoryQt.cpp:
(WebKit::mouseButtonForEvent):
(WebKit::webEventTypeForEvent):
(WebKit::WebEventFactory::createWebMouseEvent):
(WebKit::WebEventFactory::createWebWheelEvent):
* Shared/qt/WebEventFactoryQt.h:
* UIProcess/API/qt/qdesktopwebview.cpp:
(QDesktopWebView::mousePressEvent):
(QDesktopWebView::mouseMoveEvent):
(QDesktopWebView::mouseReleaseEvent):
(QDesktopWebView::mouseDoubleClickEvent):
(QDesktopWebView::wheelEvent):
(QDesktopWebView::event):
* UIProcess/API/qt/qdesktopwebview.h:
* UIProcess/qt/qdesktopwebpageproxy.cpp:
(QDesktopWebPageProxy::handleEvent):
(QDesktopWebPageProxy::handleMouseMoveEvent):
(QDesktopWebPageProxy::handleMousePressEvent):
(QDesktopWebPageProxy::handleMouseReleaseEvent):
(QDesktopWebPageProxy::handleMouseDoubleClickEvent):
(QDesktopWebPageProxy::handleWheelEvent):
(QDesktopWebPageProxy::handleHoverMoveEvent):
* UIProcess/qt/qdesktopwebpageproxy.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h
trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h
trunk/Source/WebKit2/Shared/qt/NativeWebMouseEventQt.cpp
trunk/Source/WebKit2/Shared/qt/NativeWebWheelEventQt.cpp
trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.cpp
trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.h
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp
trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (96398 => 96399)

--- trunk/Source/WebKit2/ChangeLog	2011-09-30 10:44:46 UTC (rev 96398)
+++ trunk/Source/WebKit2/ChangeLog	2011-09-30 11:58:30 UTC (rev 96399)
@@ -1,3 +1,47 @@
+2011-09-30  Zeno Albisser  zeno.albis...@nokia.com
+
+[Qt][WK2] Event delivery in QDesktopWebView is broken after merge of Qt5 refactor
+https://bugs.webkit.org/show_bug.cgi?id=69105
+
+This changes QDesktopWebView and QDesktopWebPageProxy to use QMouseEvent instead
+of QGraphicsSceneMouseEvent.
+Further it removes an endless loop introduced by the QSGItem::event() function
+delivering inputMethodEvents but no other events.
+
+Reviewed by Andreas Kling.
+
+* Shared/NativeWebMouseEvent.h:
+(WebKit::NativeWebMouseEvent::nativeEvent):
+* Shared/NativeWebWheelEvent.h:
+(WebKit::NativeWebWheelEvent::nativeEvent):
+* Shared/qt/NativeWebMouseEventQt.cpp:
+(WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
+* Shared/qt/NativeWebWheelEventQt.cpp:
+(WebKit::NativeWebWheelEvent::NativeWebWheelEvent):
+* Shared/qt/WebEventFactoryQt.cpp:
+(WebKit::mouseButtonForEvent):
+(WebKit::webEventTypeForEvent):
+(WebKit::WebEventFactory::createWebMouseEvent):
+(WebKit::WebEventFactory::createWebWheelEvent):
+* Shared/qt/WebEventFactoryQt.h:
+* UIProcess/API/qt/qdesktopwebview.cpp:
+(QDesktopWebView::mousePressEvent):
+(QDesktopWebView::mouseMoveEvent):
+(QDesktopWebView::mouseReleaseEvent):
+(QDesktopWebView::mouseDoubleClickEvent):
+(QDesktopWebView::wheelEvent):
+(QDesktopWebView::event):
+* UIProcess/API/qt/qdesktopwebview.h:
+* UIProcess/qt/qdesktopwebpageproxy.cpp:
+(QDesktopWebPageProxy::handleEvent):
+(QDesktopWebPageProxy::handleMouseMoveEvent):
+(QDesktopWebPageProxy::handleMousePressEvent):
+(QDesktopWebPageProxy::handleMouseReleaseEvent):
+(QDesktopWebPageProxy::handleMouseDoubleClickEvent):
+(QDesktopWebPageProxy::handleWheelEvent):
+(QDesktopWebPageProxy::handleHoverMoveEvent):
+* UIProcess/qt/qdesktopwebpageproxy.h:
+
 2011-09-29  Ravi Phaneendra Kasibhatla  ravi.kasibha...@motorola.com
 
 Initial implementation of WebInspector for WebKit2 GTK port.


Modified: trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h (96398 => 96399)

---

[webkit-changes] [96400] trunk/Source/WebKit2

2011-09-30 Thread carlosgc

Title: [96400] trunk/Source/WebKit2








Revision 96400
Author carlo...@webkit.org
Date 2011-09-30 07:23:43 -0700 (Fri, 30 Sep 2011)


Log Message
[UNIX] Add a method to get information for an already loaded plugin module
https://bugs.webkit.org/show_bug.cgi?id=69139

Reviewed by Martin Robinson.

* Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::pluginInfo): Private method to get
the plugin information from the module, it must be called when the
module has been already initialized.
(WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
get information of the plugin module for the given path.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (96399 => 96400)

--- trunk/Source/WebKit2/ChangeLog	2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/ChangeLog	2011-09-30 14:23:43 UTC (rev 96400)
@@ -1,3 +1,18 @@
+2011-09-30  Carlos Garcia Campos  cgar...@igalia.com
+
+[UNIX] Add a method to get information for an already loaded plugin module
+https://bugs.webkit.org/show_bug.cgi?id=69139
+
+Reviewed by Martin Robinson.
+
+* Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
+* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+(WebKit::NetscapePluginModule::pluginInfo): Private method to get
+the plugin information from the module, it must be called when the
+module has been already initialized.
+(WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
+get information of the plugin module for the given path.
+
 2011-09-30  Zeno Albisser  zeno.albis...@nokia.com
 
 [Qt][WK2] Event delivery in QDesktopWebView is broken after merge of Qt5 refactor


Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (96399 => 96400)

--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h	2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h	2011-09-30 14:23:43 UTC (rev 96400)
@@ -69,6 +69,7 @@
 #if PLUGIN_ARCHITECTURE(X11)
 void applyX11QuirksBeforeLoad();
 static void setMIMEDescription(const String mimeDescription, PluginModuleInfo);
+bool pluginInfo(PluginModuleInfo);
 #endif
 
 bool tryGetSitesWithData(VectorString);


Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (96399 => 96400)

--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp	2011-09-30 11:58:30 UTC (rev 96399)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp	2011-09-30 14:23:43 UTC (rev 96400)
@@ -118,35 +118,21 @@
 }
 }
 
-bool NetscapePluginModule::getPluginInfo(const String pluginPath, PluginModuleInfo plugin)
+bool NetscapePluginModule::pluginInfo(PluginModuleInfo plugin)
 {
-// Tempararily suppress stdout in this function as plugins will be loaded and shutdown and debug info
-// is leaked to layout test output.
-StdoutDevNullRedirector stdoutDevNullRedirector;
+ASSERT(m_isInitialized);
 
-// We are loading the plugin here since it does not seem to be a standardized way to
-// get the needed informations from a UNIX plugin without loading it.
-RefPtrNetscapePluginModule pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
-if (!pluginModule)
-return false;
+plugin.path = m_pluginPath;
+plugin.info.file = pathGetFileName(m_pluginPath);
 
-pluginModule-incrementLoadCount();
-
-plugin.path = pluginPath;
-plugin.info.file = pathGetFileName(pluginPath);
-
-Module* module = pluginModule-module();
+Module* module = m_module.get();
 NPP_GetValueProcPtr NPP_GetValue = module-functionPointerNPP_GetValueProcPtr(NP_GetValue);
-if (!NPP_GetValue) {
-pluginModule-decrementLoadCount();
+if (!NPP_GetValue)
 return false;
-}
 
 NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module-functionPointerNP_GetMIMEDescriptionFuncPtr(NP_GetMIMEDescription);
-if (!NP_GetMIMEDescription) {
-pluginModule-decrementLoadCount();
+if (!NP_GetMIMEDescription)
 return false;
-}
 
 char* buffer;
 NPError error = NPP_GetValue(0, NPPVpluginNameString, buffer);
@@ -158,16 +144,30 @@
 plugin.info.desc = buffer;
 
 const char* mimeDescription = NP_GetMIMEDescription();
-if (!mimeDescription) {
-pluginModule-decrementLoadCount();
+if (!mimeDescription)
 return false;
-}
 
 setMIMEDescription(mimeDescription, plugin);
 
+return true;
+}
+bool NetscapePluginModule::getPluginInfo(const String pluginPath, PluginModuleInfo plugin)
+{
+// Tempararily

[webkit-changes] [96401] trunk/LayoutTests

2011-09-30 Thread commit-queue

Title: [96401] trunk/LayoutTests








Revision 96401
Author commit-qu...@webkit.org
Date 2011-09-30 07:44:02 -0700 (Fri, 30 Sep 2011)


Log Message
Replace textInputController.doCommand with eventSender.keyDown in password-echo tests
https://bugs.webkit.org/show_bug.cgi?id=69143

textInputController.doCommand is not supported very well across the platforms. Replace it
with eventSender.keyDown would make the tests pass on more platforms and potentially WK2.

Patch by Chang Shu c...@webkit.org on 2011-09-30
Reviewed by Antonio Gomes.

* editing/input/resources/password-echo.js:
(init):

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/input/resources/password-echo.js




Diff

Modified: trunk/LayoutTests/ChangeLog (96400 => 96401)

--- trunk/LayoutTests/ChangeLog	2011-09-30 14:23:43 UTC (rev 96400)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 14:44:02 UTC (rev 96401)
@@ -1,3 +1,16 @@
+2011-09-30  Chang Shu  c...@webkit.org
+
+Replace textInputController.doCommand with eventSender.keyDown in password-echo tests
+https://bugs.webkit.org/show_bug.cgi?id=69143
+
+textInputController.doCommand is not supported very well across the platforms. Replace it
+with eventSender.keyDown would make the tests pass on more platforms and potentially WK2.
+
+Reviewed by Antonio Gomes.
+
+* editing/input/resources/password-echo.js:
+(init):
+
 2011-09-30  Shinichiro Hamaji  ham...@chromium.org
 
 [Chromium] Layout test failures under Snow Leopard


Modified: trunk/LayoutTests/editing/input/resources/password-echo.js (96400 => 96401)

--- trunk/LayoutTests/editing/input/resources/password-echo.js	2011-09-30 14:23:43 UTC (rev 96400)
+++ trunk/LayoutTests/editing/input/resources/password-echo.js	2011-09-30 14:44:02 UTC (rev 96401)
@@ -42,7 +42,7 @@
 {
 var expectedSecureTextLen;
 if (testIdx = 0) {
-textInputController.doCommand(moveForward:);
+eventSender.keyDown(rightArrow);
 if(tests[testIdx][3])
 assert(tests[testIdx][2], window.find(secureText(testnode.value.length), false, true), secured after delay.);
 }
@@ -53,15 +53,16 @@
 }
 
 testnode.focus();
-textInputController.doCommand(moveForward:);
+eventSender.keyDown(rightArrow);
 
 var charSequence = tests[testIdx][0];
 for (var i = 0; i  charSequence.length - 1; i++) {
 textInputController.setMarkedText(charSequence[i], testnode.value.length, testnode.value.length);
 }
-if (charSequence[charSequence.length - 1] == backspace)
-textInputController.doCommand(deleteBackward:);
-else
+if (charSequence[charSequence.length - 1] == backspace) {
+eventSender.keyDown(leftArrow);
+eventSender.keyDown(delete);
+} else
 textInputController.insertText(charSequence[charSequence.length - 1]);
 
 if(tests[testIdx][3])
@@ -75,7 +76,7 @@
 
 function init(tests)
 {
-if (window.layoutTestController  window.textInputController) {
+if (window.layoutTestController  window.textInputController  window.eventSender) {
 layoutTestController.dumpAsText();
 layoutTestController.waitUntilDone();
 if (window.internals) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96402] trunk/Tools

2011-09-30 Thread commit-queue

Title: [96402] trunk/Tools








Revision 96402
Author commit-qu...@webkit.org
Date 2011-09-30 07:54:02 -0700 (Fri, 30 Sep 2011)


Log Message
[Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents
https://bugs.webkit.org/show_bug.cgi?id=69145

This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=69105
Due to refactorings in Qt5, QMouseEvent now supports floating point coordinates
and is perfectly suitable for SceneGraph as well. GraphicsScene events
will not be available in QtGui anymore in future. Therefore we also have to change
QtWebKit to use QMouseEvents instead of QGraphicsSceneMouseEvents.

Patch by Zeno Albisser zeno.albis...@nokia.com on 2011-09-30
Reviewed by Chang Shu.

* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
(WTR::EventSenderProxy::createMouseEvent):
(WTR::EventSenderProxy::mouseDown):
(WTR::EventSenderProxy::mouseUp):
(WTR::EventSenderProxy::mouseMoveTo):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/EventSenderProxy.h
trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp




Diff

Modified: trunk/Tools/ChangeLog (96401 => 96402)

--- trunk/Tools/ChangeLog	2011-09-30 14:44:02 UTC (rev 96401)
+++ trunk/Tools/ChangeLog	2011-09-30 14:54:02 UTC (rev 96402)
@@ -1,3 +1,23 @@
+2011-09-30  Zeno Albisser  zeno.albis...@nokia.com
+
+[Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents
+https://bugs.webkit.org/show_bug.cgi?id=69145
+
+This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=69105
+Due to refactorings in Qt5, QMouseEvent now supports floating point coordinates
+and is perfectly suitable for SceneGraph as well. GraphicsScene events
+will not be available in QtGui anymore in future. Therefore we also have to change
+QtWebKit to use QMouseEvents instead of QGraphicsSceneMouseEvents.
+
+Reviewed by Chang Shu.
+
+* WebKitTestRunner/EventSenderProxy.h:
+* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
+(WTR::EventSenderProxy::createMouseEvent):
+(WTR::EventSenderProxy::mouseDown):
+(WTR::EventSenderProxy::mouseUp):
+(WTR::EventSenderProxy::mouseMoveTo):
+
 2011-09-30  James Robinson  jam...@chromium.org
 
 [chromium] Add WebKit API for sending input events to the compositor thread


Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (96401 => 96402)

--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h	2011-09-30 14:44:02 UTC (rev 96401)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h	2011-09-30 14:54:02 UTC (rev 96402)
@@ -51,7 +51,6 @@
 #if PLATFORM(QT)
 void sendOrQueueEvent(QEvent*);
 void replaySavedEvents();
-QGraphicsSceneMouseEvent* createGraphicsSceneMouseEvent(QEvent::Type, const QPoint pos, const QPoint screenPos, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers);
 #endif
 
 double m_time;


Modified: trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp (96401 => 96402)

--- trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp	2011-09-30 14:44:02 UTC (rev 96401)
+++ trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp	2011-09-30 14:54:02 UTC (rev 96402)
@@ -255,19 +255,6 @@
 m_clickButton = button;
 }
 
-QGraphicsSceneMouseEvent* EventSenderProxy::createGraphicsSceneMouseEvent(QEvent::Type type, const QPoint pos, const QPoint screenPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
-{
-QGraphicsSceneMouseEvent* event;
-event = new QGraphicsSceneMouseEvent(type);
-event-setPos(pos);
-event-setScreenPos(screenPos);
-event-setButton(button);
-event-setButtons(buttons);
-event-setModifiers(modifiers);
-
-return event;
-}
-
 void EventSenderProxy::mouseDown(unsigned button, WKEventModifiers wkModifiers)
 {
 Qt::KeyboardModifiers modifiers = getModifiers(wkModifiers);
@@ -278,7 +265,7 @@
 m_mouseButtons |= mouseButton;
 
 QPoint mousePos(m_position.x, m_position.y);
-QGraphicsSceneMouseEvent* event = createGraphicsSceneMouseEvent((m_clickCount == 2) ? QEvent::GraphicsSceneMouseDoubleClick : QEvent::GraphicsSceneMousePress,
+QMouseEvent* event = new QMouseEvent((m_clickCount == 2) ? QEvent::MouseButtonDblClick : QEvent::MouseButtonPress,
 mousePos, mousePos, mouseButton, m_mouseButtons, modifiers);
 
 sendOrQueueEvent(event);
@@ -290,7 +277,7 @@
 m_mouseButtons = ~mouseButton;
 
 QPoint mousePos(m_position.x, m_position.y);
-QGraphicsSceneMouseEvent* event = createGraphicsSceneMouseEvent(QEvent::GraphicsSceneMouseRelease,
+QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonRelease,
 mousePos, mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
 
 sendOrQueueEvent(event);
@@ -302,7 +289,7 @@
 m_position.y = y;
 
 QPoint mousePos(m_position.x, m_position.y);
-QGraphicsSceneMouseEvent* event =

[webkit-changes] [96403] trunk/LayoutTests

2011-09-30 Thread commit-queue

Title: [96403] trunk/LayoutTests








Revision 96403
Author commit-qu...@webkit.org
Date 2011-09-30 10:00:10 -0700 (Fri, 30 Sep 2011)


Log Message
LayoutTests: Rewrite fast/dom/HTMLInputElement/input-size-attribute.html
https://bugs.webkit.org/show_bug.cgi?id=69130

Patch by Antaryami Pandia antaryami.pan...@motorola.com on 2011-09-30
Reviewed by Alexey Proskuryakov.

* fast/dom/HTMLInputElement/input-size-attribute-expected.txt:
* fast/dom/HTMLInputElement/input-size-attribute.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute-expected.txt
trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute.html




Diff

Modified: trunk/LayoutTests/ChangeLog (96402 => 96403)

--- trunk/LayoutTests/ChangeLog	2011-09-30 14:54:02 UTC (rev 96402)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 17:00:10 UTC (rev 96403)
@@ -1,3 +1,13 @@
+2011-09-30  Antaryami Pandia  antaryami.pan...@motorola.com
+
+LayoutTests: Rewrite fast/dom/HTMLInputElement/input-size-attribute.html
+https://bugs.webkit.org/show_bug.cgi?id=69130
+
+Reviewed by Alexey Proskuryakov.
+
+* fast/dom/HTMLInputElement/input-size-attribute-expected.txt:
+* fast/dom/HTMLInputElement/input-size-attribute.html:
+
 2011-09-30  Chang Shu  c...@webkit.org
 
 Replace textInputController.doCommand with eventSender.keyDown in password-echo tests


Modified: trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute-expected.txt (96402 => 96403)

--- trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute-expected.txt	2011-09-30 14:54:02 UTC (rev 96402)
+++ trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute-expected.txt	2011-09-30 17:00:10 UTC (rev 96403)
@@ -4,15 +4,15 @@
 
 
 PASS input.size is 20
-PASS input.size is 20
-PASS input.size is 20
-PASS input.size is 1
-PASS input.size is 2
-PASS input.size is 20
-PASS input.size is 20
-PASS input.size is 20
-PASS input.size is 20
-PASS input.size is 10
+PASS input.setAttribute('size', '-1'); input.size is 20
+PASS input.removeAttribute('size'); input.size is 20
+PASS input.setAttribute('size', '1'); input.size is 1
+PASS input.setAttribute('size', '2'); input.size is 2
+PASS input.removeAttribute('size'); input.size is 20
+PASS input.setAttribute('size', 'a'); input.size is 20
+PASS input.removeAttribute('size'); input.size is 20
+PASS input.setAttribute('size', '0'); input.size is 20
+PASS input.setAttribute('size', '10'); input.size is 10
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute.html (96402 => 96403)

--- trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute.html	2011-09-30 14:54:02 UTC (rev 96402)
+++ trunk/LayoutTests/fast/dom/HTMLInputElement/input-size-attribute.html	2011-09-30 17:00:10 UTC (rev 96403)
@@ -16,33 +16,16 @@
 
 shouldBe(input.size, 20);
 
-input.setAttribute(size, -1);
-shouldBe(input.size, 20);
+shouldBe(input.setAttribute('size', '-1'); input.size, 20);
+shouldBe(input.removeAttribute('size'); input.size, 20);
+shouldBe(input.setAttribute('size', '1'); input.size, 1);
+shouldBe(input.setAttribute('size', '2'); input.size, 2);
+shouldBe(input.removeAttribute('size'); input.size, 20);
+shouldBe(input.setAttribute('size', 'a'); input.size, 20);
+shouldBe(input.removeAttribute('size'); input.size, 20);
+shouldBe(input.setAttribute('size', '0'); input.size, 20);
+shouldBe(input.setAttribute('size', '10'); input.size, 10);
 
-input.removeAttribute(size);
-shouldBe(input.size, 20);
-
-input.setAttribute(size, 1);
-shouldBe(input.size, 1);
-
-input.setAttribute(size, 2);
-shouldBe(input.size, 2);
-
-input.removeAttribute(size);
-shouldBe(input.size, 20);
-
-input.setAttribute(size, a);
-shouldBe(input.size, 20);
-
-input.removeAttribute(size);
-shouldBe(input.size, 20);
-
-input.setAttribute(size, 0);
-shouldBe(input.size, 20);
-
-input.setAttribute(size, 10);
-shouldBe(input.size, 10);
-
 var successfullyParsed = true;
 /script
 /body






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96404] trunk

2011-09-30 Thread mitz

Title: [96404] trunk








Revision 96404
Author m...@apple.com
Date 2011-09-30 10:05:22 -0700 (Fri, 30 Sep 2011)


Log Message
Complex spaces with synthetic bold are too wide
https://bugs.webkit.org/show_bug.cgi?id=69033

Patch by Ned Holbrook nholbr...@apple.com on 2011-09-30
Reviewed by Dan Bernstein.

Source/WebCore: 

Test: fast/text/complex-synthetic-bold-space-width.html

* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances): Subtract synthetic bold offset from spaceWidth.
* platform/graphics/win/UniscribeController.cpp:
(WebCore::UniscribeController::shapeAndPlaceItem): Ditto.

LayoutTests: 

* fast/text/complex-synthetic-bold-space-width.html: Added.
* platform/mac/fast/text/atsui-multiple-renderers-expected.png:
* platform/mac/fast/text/atsui-multiple-renderers-expected.txt:
* platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
* platform/mac/fast/text/complex-synthetic-bold-space-width-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png
trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp


Added Paths

trunk/LayoutTests/fast/text/complex-synthetic-bold-space-width.html
trunk/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png
trunk/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96403 => 96404)

--- trunk/LayoutTests/ChangeLog	2011-09-30 17:00:10 UTC (rev 96403)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 17:05:22 UTC (rev 96404)
@@ -1,3 +1,16 @@
+2011-09-30  Ned Holbrook  nholbr...@apple.com
+
+Complex spaces with synthetic bold are too wide
+https://bugs.webkit.org/show_bug.cgi?id=69033
+
+Reviewed by Dan Bernstein.
+
+* fast/text/complex-synthetic-bold-space-width.html: Added.
+* platform/mac/fast/text/atsui-multiple-renderers-expected.png:
+* platform/mac/fast/text/atsui-multiple-renderers-expected.txt:
+* platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+* platform/mac/fast/text/complex-synthetic-bold-space-width-expected.txt: Added.
+
 2011-09-30  Antaryami Pandia  antaryami.pan...@motorola.com
 
 LayoutTests: Rewrite fast/dom/HTMLInputElement/input-size-attribute.html


Added: trunk/LayoutTests/fast/text/complex-synthetic-bold-space-width.html (0 => 96404)

--- trunk/LayoutTests/fast/text/complex-synthetic-bold-space-width.html	(rev 0)
+++ trunk/LayoutTests/fast/text/complex-synthetic-bold-space-width.html	2011-09-30 17:05:22 UTC (rev 96404)
@@ -0,0 +1,2 @@
+These lines should have the same width:
+div style=font-family: geneva; font-weight: bold;. . . . . . . . abr. . . . . . . . a#x0300/div


Modified: trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt (96403 => 96404)

--- trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt	2011-09-30 17:00:10 UTC (rev 96403)
+++ trunk/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt	2011-09-30 17:05:22 UTC (rev 96404)
@@ -35,11 +35,11 @@
   RenderText {#text} at (0,0) size 0x0
   RenderTableRow {TR} at (0,30) size 262x30
 RenderTableCell {TD} at (0,30) size 131x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
-  RenderText {#text} at (2,3) size 76x25
-text run at (2,3) width 76: Lore\x{300}m 
+  RenderText {#text} at (2,3) size 75x25
+text run at (2,3) width 75: Lore\x{300}m 
   RenderInline {SPAN} at (0,0) size 53x23
-RenderText {#text} at (78,5) size 53x23
-  text run at (78,5) width 53: ipsu\x{308}m
+RenderText {#text} at (77,5) size 53x23
+  text run at (77,5) width 53: ipsu\x{308}m
   RenderText {#text} at (0,0) size 0x0
 RenderTableCell {TD} at (131,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
   RenderText {#text} at (2,3) size 75x25
@@ -65,11 +65,11 @@
   RenderText {#text} at (0,0) size 0x0
   RenderTableRow {TR} at (0,90) size 262x30
 RenderTableCell {TD} at (0,90) size 131x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
-  RenderText {#text} at (2,3) size 76x25
-text run at (2,3) width 76: Lore\x{300}m 
+  RenderText {#text} at (2,3) size 75x25
+text run at (2,3) width 75: Lore\x{300}m 
   RenderInline {SPAN} at (0,0) size

[webkit-changes] [96405] trunk

2011-09-30 Thread qi . 2 . zhang

Title: [96405] trunk








Revision 96405
Author qi.2.zh...@nokia.com
Date 2011-09-30 10:26:14 -0700 (Fri, 30 Sep 2011)


Log Message
WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
https://bugs.webkit.org/show_bug.cgi?id=42698

Reviewed by Andreas Kling.

Source/WebKit2:

Implemented layoutTestController.setAppCacheMaximumSize and layoutTestController.clearApplicationCache,
and call clearApplicationCache when layoutTest start up.

* WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
(WebKit::WebApplicationCacheManager::setAppCacheMaximumSize):
* WebProcess/ApplicationCache/WebApplicationCacheManager.h:
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleClearApplicationCache):
(WKBundleSetAppCacheMaximumSize):
* WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::clearApplicationCache):
(WebKit::InjectedBundle::setAppCacheMaximumSize):
* WebProcess/InjectedBundle/InjectedBundle.h:

Tools:

Implemented layoutTestController.setAppCacheMaximumSize and layoutTestController.clearApplicationCache,
and call clearApplicationCache when layoutTest start up.

* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::clearAllApplicationCaches):
(WTR::LayoutTestController::setAppCacheMaximumSize):
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:

LayoutTests:

Removed http/tests/appcache/max-size.html from skipped list, and also the failed expected file for http/tests/appcache/interrupted-update-expected.html

* platform/mac-wk2/http/tests/appcache: Removed.
* platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt: Removed.
* platform/wk2/Skipped:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/wk2/Skipped
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h


Removed Paths

trunk/LayoutTests/platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96404 => 96405)

--- trunk/LayoutTests/ChangeLog	2011-09-30 17:05:22 UTC (rev 96404)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 17:26:14 UTC (rev 96405)
@@ -1,3 +1,16 @@
+2011-09-30  Qi Zhang  qi.2.zh...@nokia.com
+
+WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
+https://bugs.webkit.org/show_bug.cgi?id=42698
+
+Reviewed by Andreas Kling.
+
+Removed http/tests/appcache/max-size.html from skipped list, and also the failed expected file for http/tests/appcache/interrupted-update-expected.html
+
+* platform/mac-wk2/http/tests/appcache: Removed.
+* platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt: Removed.
+* platform/wk2/Skipped:
+
 2011-09-30  Ned Holbrook  nholbr...@apple.com
 
 Complex spaces with synthetic bold are too wide


Deleted: trunk/LayoutTests/platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt (96404 => 96405)

--- trunk/LayoutTests/platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt	2011-09-30 17:05:22 UTC (rev 96404)
+++ trunk/LayoutTests/platform/mac-wk2/http/tests/appcache/interrupted-update-expected.txt	2011-09-30 17:26:14 UTC (rev 96405)
@@ -1,7 +0,0 @@
-Test that an application cache update works again after interruption.
-
-CHECKING
-NOUPDATE
-
-FAIL - the cache was already present, so we couldn't test initial loading
-


Modified: trunk/LayoutTests/platform/wk2/Skipped (96404 => 96405)

--- trunk/LayoutTests/platform/wk2/Skipped	2011-09-30 17:05:22 UTC (rev 96404)
+++ trunk/LayoutTests/platform/wk2/Skipped	2011-09-30 17:26:14 UTC (rev 96405)
@@ -709,10 +709,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=42696
 security/set-form-autocomplete-attribute.html
 
-# WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize
-# https://bugs.webkit.org/show_bug.cgi?id=42698
-http/tests/appcache/max-size.html
-
 # WebKitTestRunner needs layoutTestController.setWillSendRequestClearHeader
 # https://bugs.webkit.org/show_bug.cgi?id=42699
 http/tests/security/no-referrer.html


Modified: trunk/Source/WebKit2/ChangeLog (96404 => 96405)

[webkit-changes] [96406] trunk/Source

2011-09-30 Thread mhahnenberg

Title: [96406] trunk/Source








Revision 96406
Author mhahnenb...@apple.com
Date 2011-09-30 10:59:15 -0700 (Fri, 30 Sep 2011)


Log Message
Add getCallData to MethodTable in ClassInfo
https://bugs.webkit.org/show_bug.cgi?id=69024

Reviewed by Sam Weinig.

Source/_javascript_Core:

* _javascript_Core.exp:
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:

Added the getCallData to the MethodTable in the ClassInfo struct.
* runtime/ClassInfo.h:

Source/WebCore:

No new tests.

* WebCore.exp.in:

Changed getCallData from private to protected to allow subclasses who
don't override getCallData themselves to reference it in their own
method tables when calling the CREATE_METHOD_TABLE macro.
* bridge/runtime_method.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.exp
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
trunk/Source/_javascript_Core/runtime/ClassInfo.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/bridge/runtime_method.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96405 => 96406)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 17:59:15 UTC (rev 96406)
@@ -1,3 +1,16 @@
+2011-09-30  Mark Hahnenberg  mhahnenb...@apple.com
+
+Add getCallData to MethodTable in ClassInfo
+https://bugs.webkit.org/show_bug.cgi?id=69024
+
+Reviewed by Sam Weinig.
+
+* _javascript_Core.exp:
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
+Added the getCallData to the MethodTable in the ClassInfo struct.
+* runtime/ClassInfo.h:
+
 2011-09-29  Yuqiang Xian  yuqiang.x...@intel.com
 
 Add op_call/op_constructor support to JSVALUE32_64 DFG JIT


Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (96405 => 96406)

--- trunk/Source/_javascript_Core/_javascript_Core.exp	2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp	2011-09-30 17:59:15 UTC (rev 96406)
@@ -251,6 +251,7 @@
 __ZN3JSC4Yarr11byteCompileERNS0_11YarrPatternEPN3WTF20BumpPointerAllocatorE
 __ZN3JSC4Yarr9interpretEPNS0_15BytecodePatternERKNS_7UStringEjjPi
 __ZN3JSC4callEPNS_9ExecStateENS_7JSValueENS_8CallTypeERKNS_8CallDataES2_RKNS_7ArgListE
+__ZN3JSC6JSCell11getCallDataEPS0_RNS_8CallDataE
 __ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
 __ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateEj
 __ZN3JSC6JSCell16getConstructDataERNS_13ConstructDataE


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (96405 => 96406)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2011-09-30 17:59:15 UTC (rev 96406)
@@ -187,6 +187,7 @@
 ?functionName@DebuggerCallFrame@JSC@@QBEPBVUString@2@XZ
 ?get@Structure@JSC@@QAEIAAVJSGlobalData@2@ABVIdentifier@2@AAIAAPAVJSCell@2@@Z
 ?get@Structure@JSC@@QAEIAAVJSGlobalData@2@PAVStringImpl@WTF@@AAIAAPAVJSCell@2@@Z
+?getCallData@JSCell@JSC@@SA?AW4CallType@2@PAV12@AATCallData@2@@Z
 ?getCallDataVirtual@JSCell@JSC@@UAE?AW4CallType@2@AATCallData@2@@Z
 ?getConstructData@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
 ?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ


Modified: trunk/Source/_javascript_Core/runtime/ClassInfo.h (96405 => 96406)

--- trunk/Source/_javascript_Core/runtime/ClassInfo.h	2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/runtime/ClassInfo.h	2011-09-30 17:59:15 UTC (rev 96406)
@@ -33,10 +33,14 @@
 struct MethodTable {
 typedef void (*VisitChildrenFunctionPtr)(JSCell*, SlotVisitor);
 VisitChildrenFunctionPtr visitChildren;
+
+typedef CallType (*GetCallDataFunctionPtr)(JSCell*, CallData);
+GetCallDataFunctionPtr getCallData;
 };
 
 #define CREATE_METHOD_TABLE(ClassName) { \
-ClassName::visitChildren \
+ClassName::visitChildren, \
+ClassName::getCallData \
 }
 
 struct ClassInfo {


Modified: trunk/Source/WebCore/ChangeLog (96405 => 96406)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 17:59:15 UTC (rev 96406)
@@ -1,3 +1,19 @@
+2011-09-30  Mark Hahnenberg  mhahnenb...@apple.com
+
+Add getCallData to MethodTable in ClassInfo
+https://bugs.webkit.org/show_bug.cgi?id=69024
+
+Reviewed by Sam Weinig.
+
+No new tests.
+
+* WebCore.exp.in:
+
+Changed getCallData from private to protected to allow subclasses who 
+don't override getCallData themselves to reference it in their own 
+method tables when calling the CREATE_METHOD_TABLE macro.
+*

[webkit-changes] [96409] trunk/Source/WebCore

2011-09-30 Thread commit-queue

Title: [96409] trunk/Source/WebCore








Revision 96409
Author commit-qu...@webkit.org
Date 2011-09-30 11:20:22 -0700 (Fri, 30 Sep 2011)


Log Message
Fix EnabledAtRuntime support for constants.
https://bugs.webkit.org/show_bug.cgi?id=67311

Patch by Aaron Colwell acolw...@chromium.org on 2011-09-30
Reviewed by Adam Barth.

* bindings/scripts/CodeGeneratorV8.pm:
(GenerateImplementation):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm




Diff

Modified: trunk/Source/WebCore/ChangeLog (96408 => 96409)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 18:18:15 UTC (rev 96408)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 18:20:22 UTC (rev 96409)
@@ -1,3 +1,13 @@
+2011-09-30  Aaron Colwell  acolw...@chromium.org
+
+Fix EnabledAtRuntime support for constants.
+https://bugs.webkit.org/show_bug.cgi?id=67311
+
+Reviewed by Adam Barth.
+
+* bindings/scripts/CodeGeneratorV8.pm:
+(GenerateImplementation):
+
 2011-09-29  David Hyatt  hy...@apple.com
 
 https://bugs.webkit.org/show_bug.cgi?id=69043


Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (96408 => 96409)

--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm	2011-09-30 18:18:15 UTC (rev 96408)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm	2011-09-30 18:20:22 UTC (rev 96409)
@@ -2099,6 +2099,7 @@
 
 # Setup constants
 my $has_constants = 0;
+my @constantsEnabledAtRuntime;
 if (@{$dataNode-constants}) {
 $has_constants = 1;
 push(@implContent, static const BatchedConstant ${interfaceName}Consts[] = {\n);
@@ -2106,12 +2107,17 @@
 foreach my $constant (@{$dataNode-constants}) {
 my $name = $constant-name;
 my $value = $constant-value;
-# FIXME: we need the static_cast here only because of one constant, NodeFilter.idl
-# defines const unsigned long SHOW_ALL = 0x.  It would be better if we
-# handled this here, and converted it to a -1 constant in the c++ output.
-push(@implContent, END);
+my $attrExt = $constant-extendedAttributes;
+if ($attrExt-{EnabledAtRuntime}) {
+push(@constantsEnabledAtRuntime, $constant);
+} else {
+# FIXME: we need the static_cast here only because of one constant, NodeFilter.idl
+# defines const unsigned long SHOW_ALL = 0x.  It would be better if we
+# handled this here, and converted it to a -1 constant in the c++ output.
+push(@implContent, END);
 {${name}, static_castsigned int($value)},
 END
+}
 }
 if ($has_constants) {
 push(@implContent, };\n\n);
@@ -2234,6 +2240,22 @@
 push(@implContent, \n#endif // ${conditionalString}\n) if $conditionalString;
 }
 
+# Setup the enable-at-runtime constants if we have them
+foreach my $runtime_const (@constantsEnabledAtRuntime) {
+my $enable_function = GetRuntimeEnableFunctionName($runtime_const);
+my $conditionalString = GenerateConditionalString($runtime_const);
+my $name = $runtime_const-name;
+my $value = $runtime_const-value;
+push(@implContent, \n#if ${conditionalString}\n) if $conditionalString;
+push(@implContent, if (${enable_function}()) {\n);
+push(@implContent, END);
+static const BatchedConstant constData = {${name}, static_castsigned int(${value})};
+batchConfigureConstants(desc, proto, constData, 1);
+END
+push(@implContent, }\n);
+push(@implContent, \n#endif // ${conditionalString}\n) if $conditionalString;
+}
+
 GenerateImplementationIndexer($dataNode, $indexer);
 GenerateImplementationNamedPropertyGetter($dataNode, $namedPropertyGetter);
 GenerateImplementationCustomCall($dataNode);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96410] trunk/Source/WebCore

2011-09-30 Thread rniwa

Title: [96410] trunk/Source/WebCore








Revision 96410
Author rn...@webkit.org
Date 2011-09-30 11:28:13 -0700 (Fri, 30 Sep 2011)


Log Message
Remove unused ReplaceSelectionCommand::copyStyleToChildren
https://bugs.webkit.org/show_bug.cgi?id=69153

Reviewed by Antonio Gomes.

Removed the function because it's no called anywhere.

* editing/ReplaceSelectionCommand.cpp:
* editing/ReplaceSelectionCommand.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp
trunk/Source/WebCore/editing/ReplaceSelectionCommand.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (96409 => 96410)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 18:20:22 UTC (rev 96409)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 18:28:13 UTC (rev 96410)
@@ -1,3 +1,15 @@
+2011-09-30  Ryosuke Niwa  rn...@webkit.org
+
+Remove unused ReplaceSelectionCommand::copyStyleToChildren
+https://bugs.webkit.org/show_bug.cgi?id=69153
+
+Reviewed by Antonio Gomes.
+
+Removed the function because it's no called anywhere.
+
+* editing/ReplaceSelectionCommand.cpp:
+* editing/ReplaceSelectionCommand.h:
+
 2011-09-30  Aaron Colwell  acolw...@chromium.org
 
 Fix EnabledAtRuntime support for constants.


Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (96409 => 96410)

--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp	2011-09-30 18:20:22 UTC (rev 96409)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp	2011-09-30 18:28:13 UTC (rev 96410)
@@ -703,41 +703,6 @@
 setNodeAttribute(wrappingStyleSpan, styleAttr, style-style()-cssText());
 }
 
-// Take the style attribute of a span and apply it to it's children instead.  This allows us to
-// convert invalid HTML where a span contains block elements into valid HTML while preserving
-// styles.
-void ReplaceSelectionCommand::copyStyleToChildren(Node* parentNode, const CSSMutableStyleDeclaration* parentStyle)
-{
-ASSERT(parentNode-hasTagName(spanTag));
-NodeVector childNodes;
-for (RefPtrNode childNode = parentNode-firstChild(); childNode; childNode = childNode-nextSibling())
-childNodes.append(childNode);
-
-for (NodeVector::const_iterator it = childNodes.begin(); it != childNodes.end(); it++) {
-Node* childNode = it-get();
-if (childNode-isTextNode() || !isBlock(childNode) || childNode-hasTagName(preTag)) {
-// In this case, put a span tag around the child node.
-RefPtrNode newNode = parentNode-cloneNode(false);
-ASSERT(newNode-hasTagName(spanTag));
-HTMLElement* newSpan = toHTMLElement(newNode.get());
-setNodeAttribute(newSpan, styleAttr, parentStyle-cssText());
-insertNodeAfter(newSpan, childNode);
-ExceptionCode ec = 0;
-newSpan-appendChild(childNode, ec);
-ASSERT(!ec);
-childNode = newSpan;
-} else if (childNode-isHTMLElement()) {
-// Copy the style attribute and merge them into the child node.  We don't want to override
-// existing styles, so don't clobber on merge.
-RefPtrCSSMutableStyleDeclaration newStyle = parentStyle-copy();
-HTMLElement* childElement = toHTMLElement(childNode);
-RefPtrCSSMutableStyleDeclaration existingStyles = childElement-getInlineStyleDecl()-copy();
-existingStyles-merge(newStyle.get(), false);
-setNodeAttribute(childElement, styleAttr, existingStyles-cssText());
-}
-}
-}
-
 void ReplaceSelectionCommand::mergeEndIfNeeded()
 {
 if (!m_shouldMergeEnd)


Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.h (96409 => 96410)

--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.h	2011-09-30 18:20:22 UTC (rev 96409)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.h	2011-09-30 18:28:13 UTC (rev 96410)
@@ -89,7 +89,6 @@
 
 void removeRedundantStylesAndKeepStyleSpanInline(InsertedNodes);
 void handleStyleSpans(Node* firstNodeInserted);
-void copyStyleToChildren(Node* parentNode, const CSSMutableStyleDeclaration* parentStyle);
 void handlePasteAsQuotationNode();
 
 virtual void removeNodePreservingChildren(Node*);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96412] trunk/Source/WebKit/chromium

2011-09-30 Thread abarth

Title: [96412] trunk/Source/WebKit/chromium








Revision 96412
Author aba...@webkit.org
Date 2011-09-30 12:05:32 -0700 (Fri, 30 Sep 2011)


Log Message
webkit-chromium DEPS roll 102910-103471
https://bugs.webkit.org/show_bug.cgi?id=69160

Patch by Elliot Poger epo...@google.com on 2011-09-30
Reviewed by Adam Barth.

* DEPS:

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS




Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (96411 => 96412)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-09-30 18:44:46 UTC (rev 96411)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-09-30 19:05:32 UTC (rev 96412)
@@ -1,3 +1,12 @@
+2011-09-30  Elliot Poger  epo...@google.com
+
+webkit-chromium DEPS roll 102910-103471
+https://bugs.webkit.org/show_bug.cgi?id=69160
+
+Reviewed by Adam Barth.
+
+* DEPS:
+
 2011-09-29  Pavel Feldman  pfeld...@google.com
 
 Web Inspector: [chromium] expose inspector protocol version to the embedder.


Modified: trunk/Source/WebKit/chromium/DEPS (96411 => 96412)

--- trunk/Source/WebKit/chromium/DEPS	2011-09-30 18:44:46 UTC (rev 96411)
+++ trunk/Source/WebKit/chromium/DEPS	2011-09-30 19:05:32 UTC (rev 96412)
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '102910'
+  'chromium_rev': '103471'
 }
 
 deps = {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96413] trunk/Source/WebKit2

2011-09-30 Thread andersca

Title: [96413] trunk/Source/WebKit2








Revision 96413
Author ander...@apple.com
Date 2011-09-30 12:11:39 -0700 (Fri, 30 Sep 2011)


Log Message
Remove didCompleteRubberBandForMainFrame UIClient callback
https://bugs.webkit.org/show_bug.cgi?id=69161

Reviewed by Adam Roben.

* UIProcess/API/C/WKPage.h:
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebUIClient.cpp:
* UIProcess/WebUIClient.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::didCompleteRubberBandForFrame):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
trunk/Source/WebKit2/UIProcess/WebUIClient.cpp
trunk/Source/WebKit2/UIProcess/WebUIClient.h
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (96412 => 96413)

--- trunk/Source/WebKit2/ChangeLog	2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/ChangeLog	2011-09-30 19:11:39 UTC (rev 96413)
@@ -1,3 +1,19 @@
+2011-09-30  Anders Carlsson  ander...@apple.com
+
+Remove didCompleteRubberBandForMainFrame UIClient callback
+https://bugs.webkit.org/show_bug.cgi?id=69161
+
+Reviewed by Adam Roben.
+
+* UIProcess/API/C/WKPage.h:
+* UIProcess/WebPageProxy.cpp:
+* UIProcess/WebPageProxy.h:
+* UIProcess/WebPageProxy.messages.in:
+* UIProcess/WebUIClient.cpp:
+* UIProcess/WebUIClient.h:
+* WebProcess/WebCoreSupport/WebChromeClient.cpp:
+(WebKit::WebChromeClient::didCompleteRubberBandForFrame):
+
 2011-09-30  Qi Zhang  qi.2.zh...@nokia.com
 
 WebKitTestRunner needs layoutTestController.setAppCacheMaximumSize


Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (96412 => 96413)

--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h	2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h	2011-09-30 19:11:39 UTC (rev 96413)
@@ -191,7 +191,6 @@
 typedef void (*WKPageDrawHeaderCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
 typedef void (*WKPageDrawFooterCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
 typedef void (*WKPagePrintFrameCallback)(WKPageRef page, WKFrameRef frame, const void* clientInfo);
-typedef void (*WKPageDidCompleteRubberBandForMainFrameCallback)(WKPageRef page, WKSize initialOverhang, const void* clientInfo);
 typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
 typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
 
@@ -240,7 +239,7 @@
 WKPageDrawFooterCallbackdrawFooter;
 WKPagePrintFrameCallbackprintFrame;
 WKPageCallback  runModal;
-WKPageDidCompleteRubberBandForMainFrameCallback didCompleteRubberBandForMainFrame;
+void*   unused1; // Used to be didCompleteRubberBandForMainFrame
 WKPageSaveDataToFileInDownloadsFolderCallback   saveDataToFileInDownloadsFolder;
 WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
 


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (96412 => 96413)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-09-30 19:11:39 UTC (rev 96413)
@@ -3140,11 +3140,6 @@
 m_uiClient.runModal(this);
 }
 
-void WebPageProxy::didCompleteRubberBandForMainFrame(const IntSize initialOverhang)
-{
-m_uiClient.didCompleteRubberBandForMainFrame(this, initialOverhang);
-}
-
 void WebPageProxy::notifyScrollerThumbIsVisibleInRect(const IntRect scrollerThumb)
 {
 m_visibleScrollerThumbRect = scrollerThumb;


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (96412 => 96413)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2011-09-30 19:05:32 UTC (rev 96412)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2011-09-30 19:11:39 UTC (rev 96413)
@@ -649,7 +649,6 @@
 void exceededDatabaseQuota(uint64_t frameID, const String originIdentifier, const String databaseName, const String displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, uint64_t newQuota);
 void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
 void runModal();
-void didCompleteRubberBandForMainFrame(const WebCore::IntSize);

[webkit-changes] [96414] trunk/Tools

2011-09-30 Thread commit-queue

Title: [96414] trunk/Tools








Revision 96414
Author commit-qu...@webkit.org
Date 2011-09-30 12:34:33 -0700 (Fri, 30 Sep 2011)


Log Message
[EFL] Only save the current viewport in PixelDumpSupportEfl.
https://bugs.webkit.org/show_bug.cgi?id=68450

Patch by Raphael Kubo da Costa k...@profusion.mobi on 2011-09-30
Reviewed by Antonio Gomes.

The previous implementation saved the whole page contents in the final
PNG, however the baselines and expectations in the tree only want the
current viewport (with a scrollbar, if needed), so we now only save the
currently visible contents.

* DumpRenderTree/efl/PixelDumpSupportEfl.cpp:
(createBitmapContextFromWebView): Use
ewk_frame_visible_content_geometry_get instead of
ewk_frame_contents_size_get.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/efl/PixelDumpSupportEfl.cpp




Diff

Modified: trunk/Tools/ChangeLog (96413 => 96414)

--- trunk/Tools/ChangeLog	2011-09-30 19:11:39 UTC (rev 96413)
+++ trunk/Tools/ChangeLog	2011-09-30 19:34:33 UTC (rev 96414)
@@ -1,5 +1,22 @@
 2011-09-30  Raphael Kubo da Costa  k...@profusion.mobi
 
+[EFL] Only save the current viewport in PixelDumpSupportEfl.
+https://bugs.webkit.org/show_bug.cgi?id=68450
+
+Reviewed by Antonio Gomes.
+
+The previous implementation saved the whole page contents in the final
+PNG, however the baselines and expectations in the tree only want the
+current viewport (with a scrollbar, if needed), so we now only save the
+currently visible contents.
+
+* DumpRenderTree/efl/PixelDumpSupportEfl.cpp:
+(createBitmapContextFromWebView): Use
+ewk_frame_visible_content_geometry_get instead of
+ewk_frame_contents_size_get.
+
+2011-09-30  Raphael Kubo da Costa  k...@profusion.mobi
+
 [EFL] Support and keep track of extra windows (views).
 https://bugs.webkit.org/show_bug.cgi?id=68454
 


Modified: trunk/Tools/DumpRenderTree/efl/PixelDumpSupportEfl.cpp (96413 => 96414)

--- trunk/Tools/DumpRenderTree/efl/PixelDumpSupportEfl.cpp	2011-09-30 19:11:39 UTC (rev 96413)
+++ trunk/Tools/DumpRenderTree/efl/PixelDumpSupportEfl.cpp	2011-09-30 19:34:33 UTC (rev 96414)
@@ -41,15 +41,15 @@
 Ewk_View_Smart_Data* smartData = static_castEwk_View_Smart_Data*(evas_object_smart_data_get(browser));
 Ewk_View_Private_Data* privateData = static_castEwk_View_Private_Data*(smartData-_priv);
 
-int width, height;
-if (!ewk_frame_contents_size_get(mainFrame, width, height))
+int x, y, width, height;
+if (!ewk_frame_visible_content_geometry_get(mainFrame, EINA_TRUE, x, y, width, height))
 return 0;
 
 RefPtrcairo_surface_t surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height));
 RefPtrcairo_t context = adoptRef(cairo_create(surface.get()));
 
-const Eina_Rectangle rect = { 0, 0, width, height };
-if (!ewk_view_paint_contents(privateData, context.get(), rect))
+const Eina_Rectangle rect = { x, y, width, height };
+if (!ewk_view_paint(privateData, context.get(), rect))
 return 0;
 
 if (drawSelectionRect) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96417] trunk

2011-09-30 Thread vestbo

Title: [96417] trunk








Revision 96417
Author ves...@webkit.org
Date 2011-09-30 13:05:20 -0700 (Fri, 30 Sep 2011)


Log Message
[Qt] Prevent qDebug() output from DRT and WTR unless --verbose

For DRT we didn't install the message handler early enough to
catch output while constructing the QApplication. For WTR we
didn't even install a message handler.

Since the UI process will forward any output from the web process
we set an environment variable QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT
in WTR before the web process is started. This is picked up by the
web process which installs its own message handler.

The environment variable can be overriden on the command line if you
want to see output from the web process, or you can pass --verbose to
WTR to see output from both processes.

https://bugs.webkit.org/show_bug.cgi?id=69132

Reviewed by Andreas Kling.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/main.cpp
trunk/Tools/WebKitTestRunner/qt/main.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (96416 => 96417)

--- trunk/Source/WebKit2/ChangeLog	2011-09-30 20:04:57 UTC (rev 96416)
+++ trunk/Source/WebKit2/ChangeLog	2011-09-30 20:05:20 UTC (rev 96417)
@@ -1,3 +1,26 @@
+2011-09-30  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
+[Qt] Prevent qDebug() output from DRT and WTR unless --verbose
+
+For DRT we didn't install the message handler early enough to
+catch output while constructing the QApplication. For WTR we
+didn't even install a message handler.
+
+Since the UI process will forward any output from the web process
+we set an environment variable QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT
+in WTR before the web process is started. This is picked up by the
+web process which installs its own message handler.
+
+The environment variable can be overriden on the command line if you
+want to see output from the web process, or you can pass --verbose to
+WTR to see output from both processes.
+
+https://bugs.webkit.org/show_bug.cgi?id=69132
+
+Reviewed by Andreas Kling.
+
+* WebProcess/qt/WebProcessMainQt.cpp:
+
 2011-09-30  Anders Carlsson  ander...@apple.com
 
 Remove didCompleteRubberBandForMainFrame UIClient callback


Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp (96416 => 96417)

--- trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp	2011-09-30 20:04:57 UTC (rev 96416)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp	2011-09-30 20:05:20 UTC (rev 96417)
@@ -130,8 +130,24 @@
 QNetworkProxyFactory::setUseSystemConfiguration(true);
 }
 
+void messageHandler(QtMsgType type, const char* message)
+{
+if (type == QtCriticalMsg) {
+fprintf(stderr, %s\n, message);
+return;
+}
+
+// Do nothing
+}
+
 Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv)
 {
+// Has to be done before QApplication is constructed in case
+// QApplication itself produces debug output.
+QByteArray suppressOutput = qgetenv(QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT);
+if (!suppressOutput.isEmpty()  suppressOutput != 0)
+qInstallMsgHandler(messageHandler);
+
 QApplication::setGraphicsSystem(QLatin1String(raster));
 QApplication* app = new QApplication(argc, argv);
 #ifndef NDEBUG


Modified: trunk/Tools/ChangeLog (96416 => 96417)

--- trunk/Tools/ChangeLog	2011-09-30 20:04:57 UTC (rev 96416)
+++ trunk/Tools/ChangeLog	2011-09-30 20:05:20 UTC (rev 96417)
@@ -1,5 +1,29 @@
 2011-09-30  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
+[Qt] Prevent qDebug() output from DRT and WTR unless --verbose
+
+For DRT we didn't install the message handler early enough to
+catch output while constructing the QApplication. For WTR we
+didn't even install a message handler.
+
+Since the UI process will forward any output from the web process
+we set an environment variable QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT
+in WTR before the web process is started. This is picked up by the
+web process which installs its own message handler.
+
+The environment variable can be overriden on the command line if you
+want to see output from the web process, or you can pass --verbose to
+WTR to see output from both processes.
+
+https://bugs.webkit.org/show_bug.cgi?id=69132
+
+Reviewed by Andreas Kling.
+
+* DumpRenderTree/qt/main.cpp:
+* WebKitTestRunner/qt/main.cpp:
+
+2011-09-30  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
 [Qt] Make sure WTR sizes the window and item correctly
 
 Revision 96345 changed the logic for how the view and


Modified: trunk/Tools/DumpRenderTree/qt/main.cpp (96416 => 96417)

--- trunk/Tools/DumpRenderTree/qt/main.cpp	2011-09-30 20:04:57 UTC (rev 96416)
+++

[webkit-changes] [96418] trunk/Source/JavaScriptCore

2011-09-30 Thread commit-queue

Title: [96418] trunk/Source/_javascript_Core








Revision 96418
Author commit-qu...@webkit.org
Date 2011-09-30 13:22:20 -0700 (Fri, 30 Sep 2011)


Log Message
[Qt] wtf header files are unknown to Qt Creator
https://bugs.webkit.org/show_bug.cgi?id=69158

Adding the HEADERS variable in wtf.pri so that
the header files can be accessed easily.

Patch by Pierre Rossi pierre.ro...@gmail.com on 2011-09-30
Reviewed by Andreas Kling.

* wtf/wtf.pri:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/wtf.pri




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96417 => 96418)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 20:05:20 UTC (rev 96417)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 20:22:20 UTC (rev 96418)
@@ -1,3 +1,15 @@
+2011-09-30  Pierre Rossi  pierre.ro...@gmail.com
+
+[Qt] wtf header files are unknown to Qt Creator
+https://bugs.webkit.org/show_bug.cgi?id=69158
+
+Adding the HEADERS variable in wtf.pri so that
+the header files can be accessed easily.
+
+Reviewed by Andreas Kling.
+
+* wtf/wtf.pri:
+
 2011-09-30  Gavin Barraclough  barraclo...@apple.com
 
 Merge some more of DFGSpeculativeJIT 32_64/64


Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (96417 => 96418)

--- trunk/Source/_javascript_Core/wtf/wtf.pri	2011-09-30 20:05:20 UTC (rev 96417)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri	2011-09-30 20:22:20 UTC (rev 96418)
@@ -1,4 +1,139 @@
 # wtf - qmake build info
+HEADERS += \
+wtf/Alignment.h \
+wtf/AlwaysInline.h \
+wtf/ASCIICType.h \
+wtf/Assertions.h \
+wtf/Atomics.h \
+wtf/AVLTree.h \
+wtf/Bitmap.h \
+wtf/BitVector.h \
+wtf/BloomFilter.h \
+wtf/BoundsCheckedPointer.h \
+wtf/BumpPointerAllocator.h \
+wtf/ByteArray.h \
+wtf/CheckedArithmetic.h \
+wtf/Compiler.h \
+wtf/CrossThreadRefCounted.h \
+wtf/CryptographicallyRandomNumber.h \
+wtf/CurrentTime.h \
+wtf/DateMath.h \
+wtf/DecimalNumber.h \
+wtf/Decoder.h \
+wtf/Deque.h \
+wtf/DisallowCType.h \
+wtf/dtoa/bignum-dtoa.h \
+wtf/dtoa/bignum.h \
+wtf/dtoa/cached-powers.h \
+wtf/dtoa/diy-fp.h \
+wtf/dtoa/double-conversion.h \
+wtf/dtoa/double.h \
+wtf/dtoa/fast-dtoa.h \
+wtf/dtoa/fixed-dtoa.h \
+wtf/dtoa.h \
+wtf/dtoa/strtod.h \
+wtf/dtoa/utils.h \
+wtf/DynamicAnnotations.h \
+wtf/Encoder.h \
+wtf/FastAllocBase.h \
+wtf/FastMalloc.h \
+wtf/FixedArray.h \
+wtf/Forward.h \
+wtf/GetPtr.h \
+wtf/HashCountedSet.h \
+wtf/HashFunctions.h \
+wtf/HashIterators.h \
+wtf/HashMap.h \
+wtf/HashSet.h \
+wtf/HashTable.h \
+wtf/HashTraits.h \
+wtf/HexNumber.h \
+wtf/ListHashSet.h \
+wtf/ListRefPtr.h \
+wtf/Locker.h \
+wtf/MainThread.h \
+wtf/MallocZoneSupport.h \
+wtf/MathExtras.h \
+wtf/MD5.h \
+wtf/MessageQueue.h \
+wtf/MetaAllocator.h \
+wtf/MetaAllocatorHandle.h \
+wtf/Noncopyable.h \
+wtf/NonCopyingSort.h \
+wtf/NotFound.h \
+wtf/NullPtr.h \
+wtf/OSAllocator.h \
+wtf/OSRandomSource.h \
+wtf/OwnArrayPtr.h \
+wtf/OwnFastMallocPtr.h \
+wtf/OwnPtrCommon.h \
+wtf/OwnPtr.h \
+wtf/PackedIntVector.h \
+wtf/PageAllocationAligned.h \
+wtf/PageAllocation.h \
+wtf/PageAllocatorSymbian.h \
+wtf/PageBlock.h \
+wtf/PageReservation.h \
+wtf/ParallelJobsGeneric.h \
+wtf/ParallelJobs.h \
+wtf/ParallelJobsLibdispatch.h \
+wtf/ParallelJobsOpenMP.h \
+wtf/PassOwnArrayPtr.h \
+wtf/PassOwnPtr.h \
+wtf/PassRefPtr.h \
+wtf/PassTraits.h \
+wtf/Platform.h \
+wtf/PossiblyNull.h \
+wtf/RandomNumber.h \
+wtf/RandomNumberSeed.h \
+wtf/RedBlackTree.h \
+wtf/RefCounted.h \
+wtf/RefCountedLeakCounter.h \
+wtf/RefPtr.h \
+wtf/RefPtrHashMap.h \
+wtf/RetainPtr.h \
+wtf/SHA1.h \
+wtf/StackBounds.h \
+wtf/StaticConstructors.h \
+wtf/StdLibExtras.h \
+wtf/StringExtras.h \
+wtf/StringHasher.h \
+wtf/TCPackedCache.h \
+wtf/TCSpinLock.h \
+wtf/TCSystemAlloc.h \
+wtf/text/AtomicString.h \
+wtf/text/AtomicStringHash.h \
+wtf/text/AtomicStringImpl.h \
+wtf/text/CString.h \
+wtf/text/StringBuffer.h \
+wtf/text/StringBuilder.h \
+wtf/text/StringConcatenate.h \
+wtf/text/StringHash.h \
+wtf/text/StringImplBase.h \
+wtf/text/StringImpl.h \
+wtf/text/StringOperators.h \
+wtf/text/TextPosition.h \
+wtf/text/WTFString.h \
+wtf/Threading.h \
+wtf/ThreadingPrimitives.h \
+wtf/ThreadRestrictionVerifier.h \
+wtf/ThreadSafeRefCounted.h \
+wtf/ThreadSpecific.h \
+wtf/TypeTraits.h \
+wtf/unicode/CharacterNames.h \
+wtf/unicode/Collator.h \
+wtf/unicode/icu/UnicodeIcu.h \
+wtf/unicode/qt4/UnicodeQt4.h \
+wtf/unicode/ScriptCodesFromICU.h \
+wtf/unicode/Unicode.h \
+

[webkit-changes] [96420] trunk/LayoutTests

2011-09-30 Thread abarth

Title: [96420] trunk/LayoutTests








Revision 96420
Author aba...@webkit.org
Date 2011-09-30 13:36:23 -0700 (Fri, 30 Sep 2011)


Log Message
Update baselines after http://trac.webkit.org/changeset/96404.

* platform/chromium-cg-mac/fast/text/atsui-multiple-renderers-expected.png: Added.
* platform/chromium-cg-mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
* platform/chromium-linux/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
* platform/chromium-mac/fast/text/atsui-multiple-renderers-expected.png:
* platform/chromium-mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
* platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
* platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium-mac/fast/text/atsui-multiple-renderers-expected.png


Added Paths

trunk/LayoutTests/platform/chromium-cg-mac/fast/text/atsui-multiple-renderers-expected.png
trunk/LayoutTests/platform/chromium-cg-mac/fast/text/complex-synthetic-bold-space-width-expected.png
trunk/LayoutTests/platform/chromium-linux/fast/text/complex-synthetic-bold-space-width-expected.png
trunk/LayoutTests/platform/chromium-mac/fast/text/complex-synthetic-bold-space-width-expected.png
trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.png
trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96419 => 96420)

--- trunk/LayoutTests/ChangeLog	2011-09-30 20:36:08 UTC (rev 96419)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 20:36:23 UTC (rev 96420)
@@ -1,3 +1,15 @@
+2011-09-30  Adam Barth  aba...@webkit.org
+
+Update baselines after http://trac.webkit.org/changeset/96404.
+
+* platform/chromium-cg-mac/fast/text/atsui-multiple-renderers-expected.png: Added.
+* platform/chromium-cg-mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+* platform/chromium-linux/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+* platform/chromium-mac/fast/text/atsui-multiple-renderers-expected.png:
+* platform/chromium-mac/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+* platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+* platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt: Added.
+
 2011-09-29  David Hyatt  hy...@apple.com
 
 https://bugs.webkit.org/show_bug.cgi?id=69043


Added: trunk/LayoutTests/platform/chromium-cg-mac/fast/text/atsui-multiple-renderers-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-cg-mac/fast/text/atsui-multiple-renderers-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium-cg-mac/fast/text/complex-synthetic-bold-space-width-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-cg-mac/fast/text/complex-synthetic-bold-space-width-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium-linux/fast/text/complex-synthetic-bold-space-width-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-linux/fast/text/complex-synthetic-bold-space-width-expected.png
___

Added: svn:mime-type

Modified: trunk/LayoutTests/platform/chromium-mac/fast/text/atsui-multiple-renderers-expected.png

(Binary files differ)


Added: trunk/LayoutTests/platform/chromium-mac/fast/text/complex-synthetic-bold-space-width-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-mac/fast/text/complex-synthetic-bold-space-width-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt (0 => 96420)

--- trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium-win/fast/text/complex-synthetic-bold-space-width-expected.txt	2011-09-30 20:36:23 UTC (rev 96420)
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+

[webkit-changes] [96421] trunk/Source

2011-09-30 Thread commit-queue

Title: [96421] trunk/Source








Revision 96421
Author commit-qu...@webkit.org
Date 2011-09-30 13:47:43 -0700 (Fri, 30 Sep 2011)


Log Message
[Qt] Build fix: Qt::escape is deprecated in Qt5
https://bugs.webkit.org/show_bug.cgi?id=69162

Use QString::toHtmlEscaped in the Qt5 case.

Patch by Pierre Rossi pierre.ro...@gmail.com on 2011-09-30
Reviewed by Andreas Kling.

Source/_javascript_Core:

* _javascript_Core.pri:
* wtf/qt/UtilsQt.h: Added.
(escapeHtml):
* wtf/wtf.pri:

Source/WebCore:

No new tests needed.

* WebCore.pro: adjust the include path accordingly
in the v8 case.

Source/WebKit/qt:

* Api/qwebpage.cpp:
(QWebPage::_javascript_Alert):
(QWebPage::_javascript_Confirm):
(QWebPage::_javascript_Prompt):
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::setToolTip):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.pri
trunk/Source/_javascript_Core/wtf/wtf.pri
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pro
trunk/Source/WebKit/qt/Api/qwebpage.cpp
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp


Added Paths

trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96420 => 96421)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 20:36:23 UTC (rev 96420)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 20:47:43 UTC (rev 96421)
@@ -1,3 +1,17 @@
+2011-09-30  Pierre Rossi  pierre.ro...@gmail.com
+
+[Qt] Build fix: Qt::escape is deprecated in Qt5
+https://bugs.webkit.org/show_bug.cgi?id=69162
+
+Use QString::toHtmlEscaped in the Qt5 case.
+
+Reviewed by Andreas Kling.
+
+* _javascript_Core.pri:
+* wtf/qt/UtilsQt.h: Added.
+(escapeHtml):
+* wtf/wtf.pri:
+
 2011-09-30  Yuqiang Xian  yuqiang.x...@intel.com
 
 Fix bug in getHostCallReturnValue of DFG JIT on X86


Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (96420 => 96421)

--- trunk/Source/_javascript_Core/_javascript_Core.pri	2011-09-30 20:36:23 UTC (rev 96420)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri	2011-09-30 20:47:43 UTC (rev 96421)
@@ -33,6 +33,7 @@
 $$PWD/runtime \
 $$PWD/wtf \
 $$PWD/wtf/gobject \
+$$PWD/wtf/qt \
 $$PWD/wtf/symbian \
 $$PWD/wtf/unicode \
 $$PWD/yarr \


Added: trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h (0 => 96421)

--- trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h	(rev 0)
+++ trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h	2011-09-30 20:47:43 UTC (rev 96421)
@@ -0,0 +1,37 @@
+/*
+Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License
+along with this library; see the file COPYING.LIB.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WTF_UtilsQt_h
+#define WTF_UtilsQt_h
+
+#include QString
+#if QT_VERSION  QT_VERSION_CHECK(5, 0, 0)
+#include QTextDocument
+#endif
+
+inline QString escapeHtml(const QString string)
+{
+#if QT_VERSION = QT_VERSION_CHECK(5, 0, 0)
+return string.toHtmlEscaped();
+#else
+return Qt::escape(string);
+#endif
+}
+
+#endif // WTF_UtilsQt_h


Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (96420 => 96421)

--- trunk/Source/_javascript_Core/wtf/wtf.pri	2011-09-30 20:36:23 UTC (rev 96420)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri	2011-09-30 20:47:43 UTC (rev 96421)
@@ -84,6 +84,7 @@
 wtf/PassTraits.h \
 wtf/Platform.h \
 wtf/PossiblyNull.h \
+wtf/qt/UtilsQt.h \
 wtf/RandomNumber.h \
 wtf/RandomNumberSeed.h \
 wtf/RedBlackTree.h \


Modified: trunk/Source/WebCore/ChangeLog (96420 => 96421)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 20:36:23 UTC (rev 96420)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 20:47:43 UTC (rev 96421)
@@ -1,3 +1,17 @@
+2011-09-30  Pierre Rossi  pierre.ro...@gmail.com
+
+[Qt] Build fix: Qt::escape is deprecated in Qt5
+https://bugs.webkit.org/show_bug.cgi?id=69162
+
+Use QString::toHtmlEscaped in the Qt5 case.
+
+Reviewed by Andreas Kling.
+
+No new tests needed.
+
+* WebCore.pro: adjust the include path accordingly
+in the v8 case.
+
 2011-09-30  Ryosuke Niwa  rn...@webkit.org
 
 Remove unused

[webkit-changes] [96422] trunk/Source/WebCore

2011-09-30 Thread commit-queue

Title: [96422] trunk/Source/WebCore








Revision 96422
Author commit-qu...@webkit.org
Date 2011-09-30 13:49:27 -0700 (Fri, 30 Sep 2011)


Log Message
REGRESSION(r82611) InlineBox has 33 bits of bitset, causing alignment issues and extra memory use.
https://bugs.webkit.org/show_bug.cgi?id=64914

Patch by Andreas Kling kl...@webkit.org on 2011-09-30
Reviewed by Antti Koivisto.

Remove InlineBox::prevOnLineExists() and its two accompanying bitfields
since nobody is using them anymore. nextOnLineExists() is still used by
GTK+ accessibility code.

Also added a compile-time assertion to guard against future bloating of
the InlineBox class.

* rendering/InlineBox.cpp:
(WebCore::SameSizeAsInlineBox::~SameSizeAsInlineBox):
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/InlineBox.cpp
trunk/Source/WebCore/rendering/InlineBox.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (96421 => 96422)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 20:47:43 UTC (rev 96421)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 20:49:27 UTC (rev 96422)
@@ -1,3 +1,22 @@
+2011-09-30  Andreas Kling  kl...@webkit.org
+
+REGRESSION(r82611) InlineBox has 33 bits of bitset, causing alignment issues and extra memory use.
+https://bugs.webkit.org/show_bug.cgi?id=64914
+
+Reviewed by Antti Koivisto.
+
+Remove InlineBox::prevOnLineExists() and its two accompanying bitfields
+since nobody is using them anymore. nextOnLineExists() is still used by
+GTK+ accessibility code.
+
+Also added a compile-time assertion to guard against future bloating of
+the InlineBox class.
+
+* rendering/InlineBox.cpp:
+(WebCore::SameSizeAsInlineBox::~SameSizeAsInlineBox):
+* rendering/InlineBox.h:
+(WebCore::InlineBox::InlineBox):
+
 2011-09-30  Pierre Rossi  pierre.ro...@gmail.com
 
 [Qt] Build fix: Qt::escape is deprecated in Qt5


Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (96421 => 96422)

--- trunk/Source/WebCore/rendering/InlineBox.cpp	2011-09-30 20:47:43 UTC (rev 96421)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp	2011-09-30 20:49:27 UTC (rev 96422)
@@ -34,6 +34,19 @@
 using namespace std;
 
 namespace WebCore {
+
+class SameSizeAsInlineBox {
+virtual ~SameSizeAsInlineBox() { }
+void* a[4];
+FloatPoint b;
+float c;
+uint32_t d;
+#ifndef NDEBUG
+bool e;
+#endif
+};
+
+COMPILE_ASSERT(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), InlineBox_size_guard);
 
 #ifndef NDEBUG
 static bool inInlineBoxDetach;
@@ -258,21 +271,6 @@
 return m_nextOnLineExists;
 }
 
-bool InlineBox::prevOnLineExists() const
-{
-if (!m_determinedIfPrevOnLineExists) {
-m_determinedIfPrevOnLineExists = true;
-
-if (!parent())
-m_prevOnLineExists = false;
-else if (prevOnLine())
-m_prevOnLineExists = true;
-else
-m_prevOnLineExists = parent()-prevOnLineExists();
-}
-return m_prevOnLineExists;
-}
-
 InlineBox* InlineBox::nextLeafChild() const
 {
 InlineBox* leaf = 0;


Modified: trunk/Source/WebCore/rendering/InlineBox.h (96421 => 96422)

--- trunk/Source/WebCore/rendering/InlineBox.h	2011-09-30 20:47:43 UTC (rev 96421)
+++ trunk/Source/WebCore/rendering/InlineBox.h	2011-09-30 20:49:27 UTC (rev 96422)
@@ -56,9 +56,7 @@
 , m_dirOverride(false)
 , m_isText(false)
 , m_determinedIfNextOnLineExists(false)
-, m_determinedIfPrevOnLineExists(false)
 , m_nextOnLineExists(false)
-, m_prevOnLineExists(false)
 , m_expansion(0)
 #ifndef NDEBUG
 , m_hasBadParent(false)
@@ -90,9 +88,7 @@
 , m_dirOverride(false)
 , m_isText(false)
 , m_determinedIfNextOnLineExists(false)
-, m_determinedIfPrevOnLineExists(false)
 , m_nextOnLineExists(false)
-, m_prevOnLineExists(false)
 , m_expansion(0)
 #ifndef NDEBUG
 , m_hasBadParent(false)
@@ -203,7 +199,6 @@
 m_prev = prev;
 }
 bool nextOnLineExists() const;
-bool prevOnLineExists() const;
 
 virtual bool isLeaf() const { return true; }
 
@@ -364,9 +359,7 @@
 bool m_isText : 1; // Whether or not this object represents text with a non-zero height. Includes non-image list markers, text boxes.
 protected:
 mutable bool m_determinedIfNextOnLineExists : 1;
-mutable bool m_determinedIfPrevOnLineExists : 1;
 mutable bool m_nextOnLineExists : 1;
-mutable bool m_prevOnLineExists : 1;
 signed m_expansion : 11; // for justified text
 
 #ifndef NDEBUG






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96424] trunk/Source/JavaScriptCore

2011-09-30 Thread ggaren

Title: [96424] trunk/Source/_javascript_Core








Revision 96424
Author gga...@apple.com
Date 2011-09-30 14:15:04 -0700 (Fri, 30 Sep 2011)


Log Message
Crash due to out of bounds read/write in MarkedSpace
https://bugs.webkit.org/show_bug.cgi?id=69148

This was a case of being surprised by a poorly aritulcated cell size limit,
plus an incorrect ASSERT guarding the cell size limit.

Reviewed by Oliver Hunt.

* heap/MarkedSpace.h:
(JSC::MarkedSpace::sizeClassFor): Changed heap size ranges to be inclusive,
since it makes the ranges easier to understand.

Bumped up the max cell size to support the use case in this bug. Since the
atomSize is much bigger than it used to be, there isn't much accounting
cost to handling more size classes.

Switched to FixedArray, to help catch SizeClass indexing bugs in the future.

* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::MarkedSpace):
(JSC::MarkedSpace::resetAllocator):
(JSC::MarkedSpace::canonicalizeCellLivenessData): Updated for size ranges
being inclusive.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/MarkedSpace.cpp
trunk/Source/_javascript_Core/heap/MarkedSpace.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96423 => 96424)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 21:04:45 UTC (rev 96423)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 21:15:04 UTC (rev 96424)
@@ -1,3 +1,29 @@
+2011-09-30  Geoffrey Garen  gga...@apple.com
+
+Crash due to out of bounds read/write in MarkedSpace
+https://bugs.webkit.org/show_bug.cgi?id=69148
+
+This was a case of being surprised by a poorly aritulcated cell size limit,
+plus an incorrect ASSERT guarding the cell size limit.
+
+Reviewed by Oliver Hunt.
+
+* heap/MarkedSpace.h:
+(JSC::MarkedSpace::sizeClassFor): Changed heap size ranges to be inclusive,
+since it makes the ranges easier to understand.
+
+Bumped up the max cell size to support the use case in this bug. Since the
+atomSize is much bigger than it used to be, there isn't much accounting
+cost to handling more size classes.
+
+Switched to FixedArray, to help catch SizeClass indexing bugs in the future.
+
+* heap/MarkedSpace.cpp:
+(JSC::MarkedSpace::MarkedSpace):
+(JSC::MarkedSpace::resetAllocator):
+(JSC::MarkedSpace::canonicalizeCellLivenessData): Updated for size ranges
+being inclusive.
+
 2011-09-30  Pierre Rossi  pierre.ro...@gmail.com
 
 [Qt] Build fix: Qt::escape is deprecated in Qt5


Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.cpp (96423 => 96424)

--- trunk/Source/_javascript_Core/heap/MarkedSpace.cpp	2011-09-30 21:04:45 UTC (rev 96423)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.cpp	2011-09-30 21:15:04 UTC (rev 96424)
@@ -35,10 +35,10 @@
 , m_highWaterMark(0)
 , m_heap(heap)
 {
-for (size_t cellSize = preciseStep; cellSize  preciseCutoff; cellSize += preciseStep)
+for (size_t cellSize = preciseStep; cellSize = preciseCutoff; cellSize += preciseStep)
 sizeClassFor(cellSize).cellSize = cellSize;
 
-for (size_t cellSize = impreciseStep; cellSize  impreciseCutoff; cellSize += impreciseStep)
+for (size_t cellSize = impreciseStep; cellSize = impreciseCutoff; cellSize += impreciseStep)
 sizeClassFor(cellSize).cellSize = cellSize;
 }
 
@@ -64,19 +64,19 @@
 {
 m_waterMark = 0;
 
-for (size_t cellSize = preciseStep; cellSize  preciseCutoff; cellSize += preciseStep)
+for (size_t cellSize = preciseStep; cellSize = preciseCutoff; cellSize += preciseStep)
 sizeClassFor(cellSize).resetAllocator();
 
-for (size_t cellSize = impreciseStep; cellSize  impreciseCutoff; cellSize += impreciseStep)
+for (size_t cellSize = impreciseStep; cellSize = impreciseCutoff; cellSize += impreciseStep)
 sizeClassFor(cellSize).resetAllocator();
 }
 
 void MarkedSpace::canonicalizeCellLivenessData()
 {
-for (size_t cellSize = preciseStep; cellSize  preciseCutoff; cellSize += preciseStep)
+for (size_t cellSize = preciseStep; cellSize = preciseCutoff; cellSize += preciseStep)
 sizeClassFor(cellSize).zapFreeList();
 
-for (size_t cellSize = impreciseStep; cellSize  impreciseCutoff; cellSize += impreciseStep)
+for (size_t cellSize = impreciseStep; cellSize = impreciseCutoff; cellSize += impreciseStep)
 sizeClassFor(cellSize).zapFreeList();
 }
 


Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.h (96423 => 96424)

--- trunk/Source/_javascript_Core/heap/MarkedSpace.h	2011-09-30 21:04:45 UTC (rev 96423)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.h	2011-09-30 21:15:04 UTC (rev 96424)
@@ -32,7 +32,7 @@
 #include wtf/Noncopyable.h
 #include wtf/Vector.h
 
-#define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class)  MarkedSpace::maxCellSize, class_fits_in_cell)
+#define

[webkit-changes] [96425] trunk/Source/WebCore

2011-09-30 Thread commit-queue

Title: [96425] trunk/Source/WebCore








Revision 96425
Author commit-qu...@webkit.org
Date 2011-09-30 14:23:44 -0700 (Fri, 30 Sep 2011)


Log Message
Unreviewed, rolling out r96422.
http://trac.webkit.org/changeset/96422
https://bugs.webkit.org/show_bug.cgi?id=69170

Broke Windows build and kling wanted to roll it out as well
(Requested by rniwa on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-30

* rendering/InlineBox.cpp:
(WebCore::InlineBox::prevOnLineExists):
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/InlineBox.cpp
trunk/Source/WebCore/rendering/InlineBox.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (96424 => 96425)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 21:23:44 UTC (rev 96425)
@@ -1,3 +1,17 @@
+2011-09-30  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r96422.
+http://trac.webkit.org/changeset/96422
+https://bugs.webkit.org/show_bug.cgi?id=69170
+
+Broke Windows build and kling wanted to roll it out as well
+(Requested by rniwa on #webkit).
+
+* rendering/InlineBox.cpp:
+(WebCore::InlineBox::prevOnLineExists):
+* rendering/InlineBox.h:
+(WebCore::InlineBox::InlineBox):
+
 2011-09-30  David Hyatt  hy...@apple.com
 
 https://bugs.webkit.org/show_bug.cgi?id=69167


Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (96424 => 96425)

--- trunk/Source/WebCore/rendering/InlineBox.cpp	2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp	2011-09-30 21:23:44 UTC (rev 96425)
@@ -34,19 +34,6 @@
 using namespace std;
 
 namespace WebCore {
-
-class SameSizeAsInlineBox {
-virtual ~SameSizeAsInlineBox() { }
-void* a[4];
-FloatPoint b;
-float c;
-uint32_t d;
-#ifndef NDEBUG
-bool e;
-#endif
-};
-
-COMPILE_ASSERT(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), InlineBox_size_guard);
 
 #ifndef NDEBUG
 static bool inInlineBoxDetach;
@@ -271,6 +258,21 @@
 return m_nextOnLineExists;
 }
 
+bool InlineBox::prevOnLineExists() const
+{
+if (!m_determinedIfPrevOnLineExists) {
+m_determinedIfPrevOnLineExists = true;
+
+if (!parent())
+m_prevOnLineExists = false;
+else if (prevOnLine())
+m_prevOnLineExists = true;
+else
+m_prevOnLineExists = parent()-prevOnLineExists();
+}
+return m_prevOnLineExists;
+}
+
 InlineBox* InlineBox::nextLeafChild() const
 {
 InlineBox* leaf = 0;


Modified: trunk/Source/WebCore/rendering/InlineBox.h (96424 => 96425)

--- trunk/Source/WebCore/rendering/InlineBox.h	2011-09-30 21:15:04 UTC (rev 96424)
+++ trunk/Source/WebCore/rendering/InlineBox.h	2011-09-30 21:23:44 UTC (rev 96425)
@@ -56,7 +56,9 @@
 , m_dirOverride(false)
 , m_isText(false)
 , m_determinedIfNextOnLineExists(false)
+, m_determinedIfPrevOnLineExists(false)
 , m_nextOnLineExists(false)
+, m_prevOnLineExists(false)
 , m_expansion(0)
 #ifndef NDEBUG
 , m_hasBadParent(false)
@@ -88,7 +90,9 @@
 , m_dirOverride(false)
 , m_isText(false)
 , m_determinedIfNextOnLineExists(false)
+, m_determinedIfPrevOnLineExists(false)
 , m_nextOnLineExists(false)
+, m_prevOnLineExists(false)
 , m_expansion(0)
 #ifndef NDEBUG
 , m_hasBadParent(false)
@@ -199,6 +203,7 @@
 m_prev = prev;
 }
 bool nextOnLineExists() const;
+bool prevOnLineExists() const;
 
 virtual bool isLeaf() const { return true; }
 
@@ -359,7 +364,9 @@
 bool m_isText : 1; // Whether or not this object represents text with a non-zero height. Includes non-image list markers, text boxes.
 protected:
 mutable bool m_determinedIfNextOnLineExists : 1;
+mutable bool m_determinedIfPrevOnLineExists : 1;
 mutable bool m_nextOnLineExists : 1;
+mutable bool m_prevOnLineExists : 1;
 signed m_expansion : 11; // for justified text
 
 #ifndef NDEBUG






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96429] trunk/Source/JavaScriptCore

2011-09-30 Thread fpizlo

Title: [96429] trunk/Source/_javascript_Core








Revision 96429
Author fpi...@apple.com
Date 2011-09-30 14:44:20 -0700 (Fri, 30 Sep 2011)


Log Message
DFG 32-bit support for op_call and op_construct causes
run-_javascript_core-tests to fail
https://bugs.webkit.org/show_bug.cgi?id=69171

Reviewed by Gavin Barraclough.

This fixes one obvious bug that was causing test failures (no
support for dummy slow case for op_add in 32_64), and disables
op_call and op_construct by default.

* dfg/DFGCapabilities.h:
(JSC::DFG::canCompileOpcode):
* jit/JITArithmetic32_64.cpp:
(JSC::JIT::emit_op_add):
(JSC::JIT::emitSlow_op_add):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGCapabilities.h
trunk/Source/_javascript_Core/jit/JITArithmetic32_64.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96428 => 96429)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 21:38:26 UTC (rev 96428)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 21:44:20 UTC (rev 96429)
@@ -1,3 +1,21 @@
+2011-09-30  Filip Pizlo  fpi...@apple.com
+
+DFG 32-bit support for op_call and op_construct causes
+run-_javascript_core-tests to fail
+https://bugs.webkit.org/show_bug.cgi?id=69171
+
+Reviewed by Gavin Barraclough.
+
+This fixes one obvious bug that was causing test failures (no
+support for dummy slow case for op_add in 32_64), and disables
+op_call and op_construct by default.
+
+* dfg/DFGCapabilities.h:
+(JSC::DFG::canCompileOpcode):
+* jit/JITArithmetic32_64.cpp:
+(JSC::JIT::emit_op_add):
+(JSC::JIT::emitSlow_op_add):
+
 2011-09-30  Geoffrey Garen  gga...@apple.com
 
 Crash due to out of bounds read/write in MarkedSpace


Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.h (96428 => 96429)

--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2011-09-30 21:38:26 UTC (rev 96428)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.h	2011-09-30 21:44:20 UTC (rev 96429)
@@ -33,6 +33,13 @@
 
 #define ENABLE_DFG_RESTRICTIONS 1
 
+#if USE(JSVALUE64)
+#define ENABLE_DFG_32BIT_RESTRICTIONS 0
+#else
+#define ENABLE_DFG_32BIT_RESTRICTIONS 1
+#endif
+
+
 #if ENABLE(DFG_JIT)
 // Fast check functions; if they return true it is still necessary to
 // check opcodes.
@@ -113,8 +120,6 @@
 case op_loop_if_greatereq:
 case op_ret:
 case op_end:
-case op_call:
-case op_construct:
 case op_call_put_result:
 case op_resolve:
 case op_resolve_base:
@@ -140,7 +145,18 @@
 #else
 return true;
 #endif
+  
+// Opcodes we support conditionally on 32-bit builds. Enabling these opcodes
+// currently results in crashes, which are still being investigated.
 
+case op_call:
+case op_construct:
+#if ENABLE(DFG_32BIT_RESTRICTIONS)
+return false;
+#else
+return true;
+#endif
+
 default:
 return false;
 }


Modified: trunk/Source/_javascript_Core/jit/JITArithmetic32_64.cpp (96428 => 96429)

--- trunk/Source/_javascript_Core/jit/JITArithmetic32_64.cpp	2011-09-30 21:38:26 UTC (rev 96428)
+++ trunk/Source/_javascript_Core/jit/JITArithmetic32_64.cpp	2011-09-30 21:44:20 UTC (rev 96429)
@@ -603,6 +603,7 @@
 OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
 
 if (!types.first().mightBeNumber() || !types.second().mightBeNumber()) {
+addSlowCase();
 JITStubCall stubCall(this, cti_op_add);
 stubCall.addArgument(op1);
 stubCall.addArgument(op2);
@@ -674,8 +675,10 @@
 unsigned op2 = currentInstruction[3].u.operand;
 OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
 
-if (!types.first().mightBeNumber() || !types.second().mightBeNumber())
+if (!types.first().mightBeNumber() || !types.second().mightBeNumber()) {
+linkDummySlowCase(iter);
 return;
+}
 
 unsigned op;
 int32_t constant;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96430] trunk/Source/WebKit/chromium

2011-09-30 Thread commit-queue

Title: [96430] trunk/Source/WebKit/chromium








Revision 96430
Author commit-qu...@webkit.org
Date 2011-09-30 15:00:33 -0700 (Fri, 30 Sep 2011)


Log Message
[chromium] Pass a processed bool in WebCompositorClient::didHandleInputEvent to indicate if the event was processed
https://bugs.webkit.org/show_bug.cgi?id=69169

Patch by James Robinson jam...@chromium.org on 2011-09-30
Reviewed by Darin Fisher.

If the compositor does not process the input event the embedder might want to do something with it - for
example, if the input event type is part of a CTRL+T keyboard accelerator sequence the browser might want to
open a new tab. This passes that state through the didHandleInputEvent callback.

* public/WebCompositorClient.h:
* src/WebCompositorImpl.cpp:
(WebKit::WebCompositorImpl::handleInputEvent):

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebCompositorClient.h
trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp




Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (96429 => 96430)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-09-30 21:44:20 UTC (rev 96429)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-09-30 22:00:33 UTC (rev 96430)
@@ -1,3 +1,18 @@
+2011-09-30  James Robinson  jam...@chromium.org
+
+[chromium] Pass a processed bool in WebCompositorClient::didHandleInputEvent to indicate if the event was processed
+https://bugs.webkit.org/show_bug.cgi?id=69169
+
+Reviewed by Darin Fisher.
+
+If the compositor does not process the input event the embedder might want to do something with it - for
+example, if the input event type is part of a CTRL+T keyboard accelerator sequence the browser might want to
+open a new tab. This passes that state through the didHandleInputEvent callback.
+
+* public/WebCompositorClient.h:
+* src/WebCompositorImpl.cpp:
+(WebKit::WebCompositorImpl::handleInputEvent):
+
 2011-09-30  Elliot Poger  epo...@google.com
 
 webkit-chromium DEPS roll 102910-103471


Modified: trunk/Source/WebKit/chromium/public/WebCompositorClient.h (96429 => 96430)

--- trunk/Source/WebKit/chromium/public/WebCompositorClient.h	2011-09-30 21:44:20 UTC (rev 96429)
+++ trunk/Source/WebKit/chromium/public/WebCompositorClient.h	2011-09-30 22:00:33 UTC (rev 96430)
@@ -32,7 +32,7 @@
 public:
 // Callbacks invoked from the compositor thread.
 virtual void willShutdown() = 0;
-virtual void didHandleInputEvent() = 0;
+virtual void didHandleInputEvent(bool processed) = 0;
 
 protected:
 virtual ~WebCompositorClient() { }


Modified: trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp (96429 => 96430)

--- trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp	2011-09-30 21:44:20 UTC (rev 96429)
+++ trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp	2011-09-30 22:00:33 UTC (rev 96430)
@@ -60,7 +60,7 @@
 void WebCompositorImpl::handleInputEvent(const WebInputEvent event)
 {
 // FIXME: Do something interesting with the event here.
-m_client-didHandleInputEvent();
+m_client-didHandleInputEvent(false);
 }
 
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96431] trunk

2011-09-30 Thread hyatt

Title: [96431] trunk








Revision 96431
Author hy...@apple.com
Date 2011-09-30 15:12:37 -0700 (Fri, 30 Sep 2011)


Log Message
https://bugs.webkit.org/show_bug.cgi?id=69173

RTL/LTR mixtures still not correct in regions. Simplify the loop once I realized it's only
your directionality that matters and not your containing block's.

Reviewed by Dan Bernstein.

Source/WebCore: 

Added new test in fast/regions.

* rendering/RenderBox.cpp:
(WebCore::RenderBox::borderBoxRectInRegion):

LayoutTests: 

* fast/regions/multiple-directionality-changes-in-variable-width-regions.html: Added.
* platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png: Added.
* platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBox.cpp


Added Paths

trunk/LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html
trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png
trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (96430 => 96431)

--- trunk/LayoutTests/ChangeLog	2011-09-30 22:00:33 UTC (rev 96430)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 22:12:37 UTC (rev 96431)
@@ -1,3 +1,16 @@
+2011-09-30  David Hyatt  hy...@apple.com
+
+https://bugs.webkit.org/show_bug.cgi?id=69173
+
+RTL/LTR mixtures still not correct in regions. Simplify the loop once I realized it's only
+your directionality that matters and not your containing block's.
+
+Reviewed by Dan Bernstein.
+
+* fast/regions/multiple-directionality-changes-in-variable-width-regions.html: Added.
+* platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png: Added.
+* platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt: Added.
+
 2011-09-30  Dan Bernstein  m...@apple.com
 
 rdar://problem/10208291 first-letter in generated before content with display: table is not updated


Added: trunk/LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html (0 => 96431)

--- trunk/LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html	(rev 0)
+++ trunk/LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html	2011-09-30 22:12:37 UTC (rev 96431)
@@ -0,0 +1,64 @@
+!doctype html
+html
+head
+ style
+#content {
+-webkit-flow: flow1;
+text-align: justify;
+padding: 5px;
+direction: rtl;
+margin:0 5%;
+}
+
+#first-box {
+border: 1px solid blue;
+margin:10px 5%;
+direction:ltr;
+height:340px;
+}
+
+#second-box {
+margin:10px 10%;
+border: 1px solid green;
+direction:rtl
+}
+
+#region1, #region2, #region3 {
+border: 1px solid black;
+content: -webkit-from-flow(flow1);
+}
+
+#region1 {
+width: 400px;
+height: 100px;
+}
+
+#region2 {
+width: 500px;
+height: 180px;
+}
+
+#region3 {
+width: 200px;
+height: 120px;
+}
+
+p { direction: ltr }
+/style
+/head
+body
+div id=content
+   div id=first-box
+div id=second-box
+pThis line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region./p
+pThis line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region./p
+pThis line of text should not get out of the region./p
+/div
+/div
+/div
+
+div id=container
+div id=region1/div
+div id=region2/div
+div id=region3/div
+/div
\ No newline at end of file


Added: trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt (0 => 96431)

--- trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt	(rev 0)
+++

[webkit-changes] [96432] trunk/Source/JavaScriptCore

2011-09-30 Thread oliver

Title: [96432] trunk/Source/_javascript_Core








Revision 96432
Author oli...@apple.com
Date 2011-09-30 15:23:33 -0700 (Fri, 30 Sep 2011)


Log Message
2011-09-30  Oliver Hunt  oli...@apple.com

Need a sensible GGC policy

Reviewed by Geoff Garen.

This replaces the existing random collection policy
with a deterministic policy based on nursery size.

* heap/AllocationSpace.cpp:
(JSC::AllocationSpace::allocateSlowCase):
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::markRoots):
(JSC::Heap::collect):
* heap/Heap.h:
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::MarkedSpace):
(JSC::MarkedSpace::resetAllocator):
* heap/MarkedSpace.h:
(JSC::MarkedSpace::nurseryWaterMark):
(JSC::MarkedSpace::allocate):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/AllocationSpace.cpp
trunk/Source/_javascript_Core/heap/Heap.cpp
trunk/Source/_javascript_Core/heap/Heap.h
trunk/Source/_javascript_Core/heap/MarkedSpace.cpp
trunk/Source/_javascript_Core/heap/MarkedSpace.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96431 => 96432)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 22:12:37 UTC (rev 96431)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 22:23:33 UTC (rev 96432)
@@ -1,3 +1,26 @@
+2011-09-30  Oliver Hunt  oli...@apple.com
+
+Need a sensible GGC policy
+
+Reviewed by Geoff Garen.
+
+This replaces the existing random collection policy
+with a deterministic policy based on nursery size.
+
+* heap/AllocationSpace.cpp:
+(JSC::AllocationSpace::allocateSlowCase):
+* heap/Heap.cpp:
+(JSC::Heap::Heap):
+(JSC::Heap::markRoots):
+(JSC::Heap::collect):
+* heap/Heap.h:
+* heap/MarkedSpace.cpp:
+(JSC::MarkedSpace::MarkedSpace):
+(JSC::MarkedSpace::resetAllocator):
+* heap/MarkedSpace.h:
+(JSC::MarkedSpace::nurseryWaterMark):
+(JSC::MarkedSpace::allocate):
+
 2011-09-30  Filip Pizlo  fpi...@apple.com
 
 DFG 32-bit support for op_call and op_construct causes


Modified: trunk/Source/_javascript_Core/heap/AllocationSpace.cpp (96431 => 96432)

--- trunk/Source/_javascript_Core/heap/AllocationSpace.cpp	2011-09-30 22:12:37 UTC (rev 96431)
+++ trunk/Source/_javascript_Core/heap/AllocationSpace.cpp	2011-09-30 22:23:33 UTC (rev 96432)
@@ -55,7 +55,13 @@
 
 AllocationEffort allocationEffort;
 
-if (m_markedSpace.waterMark()  m_markedSpace.highWaterMark() || !m_heap-m_isSafeToCollect)
+if ((
+#if ENABLE(GGC)
+ m_markedSpace.nurseryWaterMark()  m_heap-m_minBytesPerCycle
+#else
+ m_markedSpace.waterMark()  m_markedSpace.highWaterMark()
+#endif
+ ) || !m_heap-m_isSafeToCollect)
 allocationEffort = AllocationMustSucceed;
 else
 allocationEffort = AllocationCanFail;


Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (96431 => 96432)

--- trunk/Source/_javascript_Core/heap/Heap.cpp	2011-09-30 22:12:37 UTC (rev 96431)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp	2011-09-30 22:23:33 UTC (rev 96432)
@@ -214,6 +214,7 @@
 Heap::Heap(JSGlobalData* globalData, HeapSize heapSize)
 : m_heapSize(heapSize)
 , m_minBytesPerCycle(heapSizeForHint(heapSize))
+, m_lastFullGCSize(0)
 , m_operationInProgress(NoOperation)
 , m_objectSpace(this)
 , m_extraCost(0)
@@ -453,8 +454,9 @@
 m_operationInProgress = NoOperation;
 }
 
-void Heap::markRoots()
+void Heap::markRoots(bool fullGC)
 {
+UNUSED_PARAM(fullGC);
 ASSERT(isValidThreadState(m_globalData));
 if (m_operationInProgress != NoOperation)
 CRASH();
@@ -473,9 +475,7 @@
 m_jettisonedCodeBlocks.deleteUnmarkedCodeBlocks();
 #if ENABLE(GGC)
 MarkedBlock::DirtyCellVector dirtyCells;
-// Until we have a sensible policy we just random choose to perform
-// young generation collections 90% of the time.
-if (WTF::randomNumber()  0.1)
+if (!fullGC)
 m_objectSpace.gatherDirtyCells(dirtyCells);
 else
 #endif
@@ -486,7 +486,8 @@
 HeapRootVisitor heapRootVisitor(visitor);
 
 #if ENABLE(GGC)
-for (size_t i = 0; i  dirtyObjectCount; i++) {
+size_t dirtyCellCount = dirtyCells.size();
+for (size_t i = 0; i  dirtyCellCount; i++) {
 heapRootVisitor.visitChildren(dirtyCells[i]);
 visitor.drain();
 }
@@ -599,10 +600,13 @@
 ASSERT(globalData()-identifierTable == wtfThreadData().currentIdentifierTable());
 ASSERT(m_isSafeToCollect);
 _javascript_CORE_GC_BEGIN();
-
+bool fullGC = sweepToggle == DoSweep;
+if (!fullGC)
+fullGC = (capacity()  4 * m_lastFullGCSize);  
 canonicalizeCellLivenessData();
-markRoots();
 
+markRoots(fullGC);
+
 harvestWeakReferences();
 m_handleHeap.finalizeWeakHandles();
 m_globalData-smallStrings.finalizeSmallStrings();
@@

[webkit-changes] [96433] trunk

2011-09-30 Thread jnd

Title: [96433] trunk








Revision 96433
Author j...@chromium.org
Date 2011-09-30 15:31:01 -0700 (Fri, 30 Sep 2011)


Log Message
Source/WebCore: Support -webkit-tap-highlight-color when enabling touch events support.
https://bugs.webkit.org/show_bug.cgi?id=48544

Reviewed by Kenneth Rohde Christiansen.

Original code from the iOS WebCore code dump, extracted and modified by tijiang@rim and jnd@chromium.
Supports the new CSS property -webkit-tap-highlight-color on platforms which support touch events.
Platform can override WebCore::RenderTheme::platformTapHighlightColor to use its own platform
specific default tap highlight color. Otherwise RenderTheme::defaultTapHighlightColor will be
used as default tap highlight color.

Test: fast/events/touch/tap-highlight-color.html

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::tapHighlightColor):
* rendering/RenderTheme.h:
(WebCore::RenderTheme::platformTapHighlightColor):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::initialTapHighlightColor):
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::tapHighlightColor):
(WebCore::InheritedFlags::setTapHighlightColor):
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:

LayoutTests: Support -webkit-tap-highlight-color in WebCore when enabling touch events support.
https://bugs.webkit.org/show_bug.cgi?id=48544.

Reviewed by Kenneth Rohde Christiansen.

Add a layout test to get customized tap highlight color set by page author.

* fast/css/getComputedStyle/computed-style-without-renderer.html:
* fast/css/getComputedStyle/computed-style.html:
* fast/events/touch/script-tests/tap-highlight-color.js: Added.
(onTouchStart):
(touchTargets):
* fast/events/touch/tap-highlight-color-expected.txt: Added.
* fast/events/touch/tap-highlight-color.html: Added.
* svg/css/getComputedStyle-basic.xhtml:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html
trunk/LayoutTests/fast/css/getComputedStyle/computed-style.html
trunk/LayoutTests/svg/css/getComputedStyle-basic.xhtml
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSPropertyNames.in
trunk/Source/WebCore/css/CSSStyleSelector.cpp
trunk/Source/WebCore/rendering/RenderTheme.cpp
trunk/Source/WebCore/rendering/RenderTheme.h
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
trunk/Source/WebCore/rendering/style/RenderStyle.h
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h


Added Paths

trunk/LayoutTests/fast/events/touch/script-tests/tap-highlight-color.js
trunk/LayoutTests/fast/events/touch/tap-highlight-color-expected.txt
trunk/LayoutTests/fast/events/touch/tap-highlight-color.html




Diff

Modified: trunk/LayoutTests/ChangeLog (96432 => 96433)

--- trunk/LayoutTests/ChangeLog	2011-09-30 22:23:33 UTC (rev 96432)
+++ trunk/LayoutTests/ChangeLog	2011-09-30 22:31:01 UTC (rev 96433)
@@ -1,3 +1,21 @@
+2011-09-30  Johnny Ding  j...@chromium.org
+
+Support -webkit-tap-highlight-color in WebCore when enabling touch events support. 
+https://bugs.webkit.org/show_bug.cgi?id=48544.
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Add a layout test to get customized tap highlight color set by page author.
+
+* fast/css/getComputedStyle/computed-style-without-renderer.html:
+* fast/css/getComputedStyle/computed-style.html:
+* fast/events/touch/script-tests/tap-highlight-color.js: Added.
+(onTouchStart):
+(touchTargets):
+* fast/events/touch/tap-highlight-color-expected.txt: Added.
+* fast/events/touch/tap-highlight-color.html: Added.
+* svg/css/getComputedStyle-basic.xhtml:
+
 2011-09-30  David Hyatt  hy...@apple.com
 
 https://bugs.webkit.org/show_bug.cgi?id=69173


Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html (96432 => 96433)

--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html	2011-09-30 22:23:33 UTC (rev 96432)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html	2011-09-30 22:31:01 UTC (rev 96433)
@@ -28,7 +28,11 @@
 if (!properties) {
 for (var i = 0; i != style.length; ++i) {
 var name = style.item(i);
-if (name != -webkit-dashboard-region)
+// -webkit-tap-highlight-color is only available on the
+// ports

[webkit-changes] [96434] trunk/Tools

2011-09-30 Thread simon . fraser

Title: [96434] trunk/Tools








Revision 96434
Author simon.fra...@apple.com
Date 2011-09-30 15:53:53 -0700 (Fri, 30 Sep 2011)


Log Message
fast/forms/text-control-intrinsic-widths.html fails on Mac if Word/Office fonts are installed
https://bugs.webkit.org/show_bug.cgi?id=35273

Reviewed by Dan Bernstein.

There are two types of font issue that can cause layout test failure.
First, the user may have non-standard fonts installed that affect the layout
of some tests. For example, some tests use the MS Gothic font if installed.

Secondly, the user may have duplicate fonts installed in ~/Library/Fonts,
which override the system fonts (e.g. a copy of Arial from MS Office). For
some tests, this can affect font metrics or fallback behavior.

This change addresses the first problem only. It limits the set of fonts
available through NSFontManager, by swizzling some methods to return
a list of fonts or font families which only include fonts from a hardcoded
whitelist.

* DumpRenderTree/mac/DumpRenderTree.mm:
(allowedFontFamilySet):
(drt_NSFontManager_availableFontFamilies):
(drt_NSFontManager_availableFonts):
(swizzleNSFontManagerMethods):
(activateTestingFonts):
(adjustFonts):
(createWebViewAndOffscreenWindow):
(prepareConsistentTestingEnvironment):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::allowedFontFamilySet):
(WTR::drt_NSFontManager_availableFontFamilies):
(WTR::drt_NSFontManager_availableFonts):
(WTR::swizzleNSFontManagerMethods):
(WTR::InjectedBundle::platformInitialize):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm
trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm




Diff

Modified: trunk/Tools/ChangeLog (96433 => 96434)

--- trunk/Tools/ChangeLog	2011-09-30 22:31:01 UTC (rev 96433)
+++ trunk/Tools/ChangeLog	2011-09-30 22:53:53 UTC (rev 96434)
@@ -1,3 +1,39 @@
+2011-09-30  Simon Fraser  simon.fra...@apple.com
+
+fast/forms/text-control-intrinsic-widths.html fails on Mac if Word/Office fonts are installed
+https://bugs.webkit.org/show_bug.cgi?id=35273
+
+Reviewed by Dan Bernstein.
+
+There are two types of font issue that can cause layout test failure.
+First, the user may have non-standard fonts installed that affect the layout
+of some tests. For example, some tests use the MS Gothic font if installed.
+
+Secondly, the user may have duplicate fonts installed in ~/Library/Fonts,
+which override the system fonts (e.g. a copy of Arial from MS Office). For
+some tests, this can affect font metrics or fallback behavior.
+
+This change addresses the first problem only. It limits the set of fonts
+available through NSFontManager, by swizzling some methods to return
+a list of fonts or font families which only include fonts from a hardcoded
+whitelist.
+
+* DumpRenderTree/mac/DumpRenderTree.mm:
+(allowedFontFamilySet):
+(drt_NSFontManager_availableFontFamilies):
+(drt_NSFontManager_availableFonts):
+(swizzleNSFontManagerMethods):
+(activateTestingFonts):
+(adjustFonts):
+(createWebViewAndOffscreenWindow):
+(prepareConsistentTestingEnvironment):
+* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+(WTR::allowedFontFamilySet):
+(WTR::drt_NSFontManager_availableFontFamilies):
+(WTR::drt_NSFontManager_availableFonts):
+(WTR::swizzleNSFontManagerMethods):
+(WTR::InjectedBundle::platformInitialize):
+
 2011-09-30  David Levin  le...@chromium.org
 
 Need to skip webkitpy.common.checkout.baselineoptimizer_unittest.BaselineOptimizerTest on Windows..


Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (96433 => 96434)

--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2011-09-30 22:31:01 UTC (rev 96433)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2011-09-30 22:53:53 UTC (rev 96434)
@@ -221,41 +221,187 @@
 return false;
 }
 
-static void activateFonts()
+static NSSet *allowedFontFamilySet()
 {
-#ifdef BUILDING_ON_LEOPARD
-static const char* fontSectionNames[] = {
-Ahem,
-WeightWatcher100,
-WeightWatcher200,
-WeightWatcher300,
-WeightWatcher400,
-WeightWatcher500,
-WeightWatcher600,
-WeightWatcher700,
-WeightWatcher800,
-WeightWatcher900,
-0
-};
+static NSSet *fontFamiliySet = [[NSSet setWithObjects:
+@Ahem,
+@Al Bayan,
+@American Typewriter,
+@Andale Mono,
+@Apple Braille,
+@Apple Color Emoji,
+@Apple Chancery,
+@Apple Garamond BT,
+@Apple LiGothic,
+@Apple LiSung,
+@Apple Symbols,
+@AppleGothic,
+@AppleMyungjo,
+@Arial Black,
+@Arial Hebrew,
+@Arial Narrow,
+@Arial Rounded MT Bold,
+@Arial Unicode MS,

[webkit-changes] [96436] trunk/Source/JavaScriptCore

2011-09-30 Thread barraclough

Title: [96436] trunk/Source/_javascript_Core








Revision 96436
Author barraclo...@apple.com
Date 2011-09-30 16:05:59 -0700 (Fri, 30 Sep 2011)


Log Message
DFG JIT, Branch on integer can always be a 32-bit compare.
https://bugs.webkit.org/show_bug.cgi?id=69174

Reviewed by Sam Weinig.

if (shouldSpeculateInteger(node.child1())  !isStrictInt32(node.child1())),
the JSVALUE64 JIT will currently compare all 64bits in the register, but in
these cases the DataFormat is always a JS boxed integer. In these cases we
can just compare the low 32bits anyway - no need to check the tag.
This allows the code to be unified with the JSVALUE32_64 JIT.

* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96435 => 96436)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 23:01:23 UTC (rev 96435)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 23:05:59 UTC (rev 96436)
@@ -1,3 +1,21 @@
+2011-09-30  Gavin Barraclough  barraclo...@apple.com
+
+DFG JIT, Branch on integer can always be a 32-bit compare.
+https://bugs.webkit.org/show_bug.cgi?id=69174
+
+Reviewed by Sam Weinig.
+
+if (shouldSpeculateInteger(node.child1())  !isStrictInt32(node.child1())),
+the JSVALUE64 JIT will currently compare all 64bits in the register, but in
+these cases the DataFormat is always a JS boxed integer. In these cases we
+can just compare the low 32bits anyway - no need to check the tag.
+This allows the code to be unified with the JSVALUE32_64 JIT.
+
+* dfg/DFGSpeculativeJIT32_64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+
 2011-09-30  Oliver Hunt  oli...@apple.com
 
 Need a sensible GGC policy


Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (96435 => 96436)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2011-09-30 23:01:23 UTC (rev 96435)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2011-09-30 23:05:59 UTC (rev 96436)
@@ -1270,7 +1270,7 @@
 
 case Branch:
 if (isStrictInt32(node.child1()) || shouldSpeculateInteger(node.child1())) {
-SpeculateStrictInt32Operand op(this, node.child1());
+SpeculateIntegerOperand op(this, node.child1());
 
 BlockIndex taken = m_jit.graph().blockIndexForBytecodeOffset(node.takenBytecodeOffset());
 BlockIndex notTaken = m_jit.graph().blockIndexForBytecodeOffset(node.notTakenBytecodeOffset());


Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (96435 => 96436)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2011-09-30 23:01:23 UTC (rev 96435)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2011-09-30 23:05:59 UTC (rev 96436)
@@ -1363,8 +1363,8 @@
 }
 
 case Branch:
-if (isStrictInt32(node.child1())) {
-SpeculateStrictInt32Operand op(this, node.child1());
+if (isStrictInt32(node.child1()) || shouldSpeculateInteger(node.child1())) {
+SpeculateIntegerOperand op(this, node.child1());
 
 BlockIndex taken = m_jit.graph().blockIndexForBytecodeOffset(node.takenBytecodeOffset());
 BlockIndex notTaken = m_jit.graph().blockIndexForBytecodeOffset(node.notTakenBytecodeOffset());
@@ -1385,29 +1385,6 @@
 noResult(m_compileIndex);
 break;
 }
-if (shouldSpeculateInteger(node.child1())) {
-SpeculateIntegerOperand op(this, node.child1());
-
-BlockIndex taken = m_jit.graph().blockIndexForBytecodeOffset(node.takenBytecodeOffset());
-BlockIndex notTaken = m_jit.graph().blockIndexForBytecodeOffset(node.notTakenBytecodeOffset());
-
-MacroAssembler::RelationalCondition condition = MacroAssembler::NotEqual;
-
-if (taken == (m_block + 1)) {
-condition = MacroAssembler::Equal;
-BlockIndex tmp = taken;
-taken = notTaken;
-notTaken = tmp;
-}
-
-addBranch(m_jit.branchPtr(condition, op.gpr(), GPRInfo::tagTypeNumberRegister), taken);
-
-if (notTaken != (m_block + 1))
-addBranch(m_jit.jump(), notTaken);
-
-noResult(m_compileIndex);
-break;
-}
 emitBranch(node);
 break;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96437] trunk/Source/WebCore

2011-09-30 Thread mjs

Title: [96437] trunk/Source/WebCore








Revision 96437
Author m...@apple.com
Date 2011-09-30 16:30:59 -0700 (Fri, 30 Sep 2011)


Log Message
Loading page on potterybankids causes reproducible assertion failure in debug builds
https://bugs.webkit.org/show_bug.cgi?id=69185
rdar://problem/10218241

Reviewed by Simon Fraser.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::computeRepaintRects): Remove assert condition that isn't guaranteed
to be true.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (96436 => 96437)

--- trunk/Source/WebCore/ChangeLog	2011-09-30 23:05:59 UTC (rev 96436)
+++ trunk/Source/WebCore/ChangeLog	2011-09-30 23:30:59 UTC (rev 96437)
@@ -1,3 +1,15 @@
+2011-09-30  Maciej Stachowiak  m...@apple.com
+
+Loading page on potterybankids causes reproducible assertion failure in debug builds
+https://bugs.webkit.org/show_bug.cgi?id=69185
+rdar://problem/10218241
+
+Reviewed by Simon Fraser.
+
+* rendering/RenderLayer.cpp:
+(WebCore::RenderLayer::computeRepaintRects): Remove assert condition that isn't guaranteed
+to be true.
+
 2011-09-30  Johnny Ding  j...@chromium.org
 
 Support -webkit-tap-highlight-color when enabling touch events support.


Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (96436 => 96437)

--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2011-09-30 23:05:59 UTC (rev 96436)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2011-09-30 23:30:59 UTC (rev 96437)
@@ -400,7 +400,6 @@
 
 void RenderLayer::computeRepaintRects(IntPoint* offsetFromRoot)
 {
-ASSERT(m_hasVisibleContent);
 ASSERT(!m_visibleContentStatusDirty);
 
 RenderBoxModelObject* repaintContainer = renderer()-containerForRepaint();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96438] trunk/Source/JavaScriptCore

2011-09-30 Thread barraclough

Title: [96438] trunk/Source/_javascript_Core








Revision 96438
Author barraclo...@apple.com
Date 2011-09-30 16:54:44 -0700 (Fri, 30 Sep 2011)


Log Message
StringRecursionChecker should not work in terms of EncodedJSValue
https://bugs.webkit.org/show_bug.cgi?id=69188

Reviewed by Oliver Hunt.

0 is not the empty value on 32_64.
Code that casts literals to EncodedJSValues may be unsafe if we change our internal representation.

* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncToString):
(JSC::arrayProtoFuncToLocaleString):
(JSC::arrayProtoFuncJoin):
* runtime/ErrorPrototype.cpp:
(JSC::errorProtoFuncToString):
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncToString):
* runtime/StringRecursionChecker.cpp:
(JSC::StringRecursionChecker::throwStackOverflowError):
(JSC::StringRecursionChecker::emptyString):
* runtime/StringRecursionChecker.h:
(JSC::StringRecursionChecker::performCheck):
(JSC::StringRecursionChecker::earlyReturnValue):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp
trunk/Source/_javascript_Core/runtime/ErrorPrototype.cpp
trunk/Source/_javascript_Core/runtime/RegExpPrototype.cpp
trunk/Source/_javascript_Core/runtime/StringRecursionChecker.cpp
trunk/Source/_javascript_Core/runtime/StringRecursionChecker.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96437 => 96438)

--- trunk/Source/_javascript_Core/ChangeLog	2011-09-30 23:30:59 UTC (rev 96437)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-30 23:54:44 UTC (rev 96438)
@@ -1,5 +1,30 @@
 2011-09-30  Gavin Barraclough  barraclo...@apple.com
 
+StringRecursionChecker should not work in terms of EncodedJSValue
+https://bugs.webkit.org/show_bug.cgi?id=69188
+
+Reviewed by Oliver Hunt.
+
+0 is not the empty value on 32_64.
+Code that casts literals to EncodedJSValues may be unsafe if we change our internal representation.
+
+* runtime/ArrayPrototype.cpp:
+(JSC::arrayProtoFuncToString):
+(JSC::arrayProtoFuncToLocaleString):
+(JSC::arrayProtoFuncJoin):
+* runtime/ErrorPrototype.cpp:
+(JSC::errorProtoFuncToString):
+* runtime/RegExpPrototype.cpp:
+(JSC::regExpProtoFuncToString):
+* runtime/StringRecursionChecker.cpp:
+(JSC::StringRecursionChecker::throwStackOverflowError):
+(JSC::StringRecursionChecker::emptyString):
+* runtime/StringRecursionChecker.h:
+(JSC::StringRecursionChecker::performCheck):
+(JSC::StringRecursionChecker::earlyReturnValue):
+
+2011-09-30  Gavin Barraclough  barraclo...@apple.com
+
 DFG JIT, Branch on integer can always be a 32-bit compare.
 https://bugs.webkit.org/show_bug.cgi?id=69174
 


Modified: trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp (96437 => 96438)

--- trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2011-09-30 23:30:59 UTC (rev 96437)
+++ trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2011-09-30 23:54:44 UTC (rev 96438)
@@ -180,8 +180,8 @@
 return JSValue::encode(jsUndefined());
 
 StringRecursionChecker checker(exec, thisObj);
-if (EncodedJSValue earlyReturnValue = checker.earlyReturnValue())
-return earlyReturnValue;
+if (JSValue earlyReturnValue = checker.earlyReturnValue())
+return JSValue::encode(earlyReturnValue);
 
 unsigned totalSize = length ? length - 1 : 0;
 #if OS(SYMBIAN)
@@ -243,8 +243,8 @@
 return JSValue::encode(jsUndefined());
 
 StringRecursionChecker checker(exec, thisObj);
-if (EncodedJSValue earlyReturnValue = checker.earlyReturnValue())
-return earlyReturnValue;
+if (JSValue earlyReturnValue = checker.earlyReturnValue())
+return JSValue::encode(earlyReturnValue);
 
 JSStringBuilder strBuffer;
 for (unsigned k = 0; k  length; k++) {
@@ -277,8 +277,8 @@
 return JSValue::encode(jsUndefined());
 
 StringRecursionChecker checker(exec, thisObj);
-if (EncodedJSValue earlyReturnValue = checker.earlyReturnValue())
-return earlyReturnValue;
+if (JSValue earlyReturnValue = checker.earlyReturnValue())
+return JSValue::encode(earlyReturnValue);
 
 JSStringBuilder strBuffer;
 


Modified: trunk/Source/_javascript_Core/runtime/ErrorPrototype.cpp (96437 => 96438)

--- trunk/Source/_javascript_Core/runtime/ErrorPrototype.cpp	2011-09-30 23:30:59 UTC (rev 96437)
+++ trunk/Source/_javascript_Core/runtime/ErrorPrototype.cpp	2011-09-30 23:54:44 UTC (rev 96438)
@@ -79,8 +79,8 @@
 JSObject* thisObj = exec-hostThisValue().toThisObject(exec);
 
 StringRecursionChecker checker(exec, thisObj);
-if (EncodedJSValue earlyReturnValue = checker.earlyReturnValue())
-return earlyReturnValue;
+if (JSValue earlyReturnValue = checker.earlyReturnValue())
+return JSValue::encode(earlyReturnValue);
 
 JSValue name = thisObj-get(exec, exec-propertyNames().name);
 JSValue message =

[webkit-changes] [96439] trunk

2011-09-30 Thread weinig

Title: [96439] trunk








Revision 96439
Author wei...@apple.com
Date 2011-09-30 17:16:48 -0700 (Fri, 30 Sep 2011)


Log Message
Add support for eventSender.mouseScrollBy in WTR
https://bugs.webkit.org/show_bug.cgi?id=69189

Source/WebKit2: 

Reviewed by Simon Fraser.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::handleWheelEvent):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::wheelEventSyncForTesting):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Add sync version of wheel event handling for use in testing.

Tools: 

Add implementation of eventSender.mouseScrollBy for the mac.

Reviewed by Simon Fraser.

* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::EventSendingController::keyDown):
(WTR::EventSendingController::mouseScrollBy):
* WebKitTestRunner/InjectedBundle/EventSendingController.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
* WebKitTestRunner/mac/EventSenderProxy.mm:
(WTR::EventSenderProxy::mouseScrollBy):

LayoutTests: 

Reviewed by Simon Fraser.

* platform/mac-wk2/Skipped:
Removes tests that used eventSender.mouseScrollBy.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac-wk2/Skipped
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/EventSenderProxy.h
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl
trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h
trunk/Tools/WebKitTestRunner/TestController.cpp
trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (96438 => 96439)

--- trunk/LayoutTests/ChangeLog	2011-09-30 23:54:44 UTC (rev 96438)
+++ trunk/LayoutTests/ChangeLog	2011-10-01 00:16:48 UTC (rev 96439)
@@ -1,3 +1,13 @@
+2011-09-30  Sam Weinig  s...@webkit.org
+
+Add support for eventSender.mouseScrollBy in WTR
+https://bugs.webkit.org/show_bug.cgi?id=69189
+
+Reviewed by Simon Fraser.
+
+* platform/mac-wk2/Skipped:
+Removes tests that used eventSender.mouseScrollBy.
+
 2011-09-30  Johnny Ding  j...@chromium.org
 
 Support -webkit-tap-highlight-color in WebCore when enabling touch events support. 


Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (96438 => 96439)

--- trunk/LayoutTests/platform/mac-wk2/Skipped	2011-09-30 23:54:44 UTC (rev 96438)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped	2011-10-01 00:16:48 UTC (rev 96439)
@@ -147,14 +147,11 @@
 fast/events/node-event-anchor-lock.html
 fast/events/ondragenter.html
 fast/events/open-window-from-another-frame.html
-fast/events/platform-wheelevent-in-scrolling-div.html
 fast/events/popup-blocking-click-in-iframe.html
 fast/events/popup-when-select-change.html
 fast/events/prevent-drag-to-navigate.html
-fast/events/remove-child-onscroll.html
 fast/events/right-click-focus.html
 fast/events/scroll-after-click-on-tab-index.html
-fast/events/scroll-in-scaled-page-with-overflow-hidden.html
 fast/events/selectstart-by-drag.html
 fast/events/selectstart-prevent-selection-on-right-click.html
 fast/events/standalone-image-drag-to-editable.html


Modified: trunk/Source/WebKit2/ChangeLog (96438 => 96439)

--- trunk/Source/WebKit2/ChangeLog	2011-09-30 23:54:44 UTC (rev 96438)
+++ trunk/Source/WebKit2/ChangeLog	2011-10-01 00:16:48 UTC (rev 96439)
@@ -1,3 +1,18 @@
+2011-09-30  Sam Weinig  s...@webkit.org
+
+Add support for eventSender.mouseScrollBy in WTR
+https://bugs.webkit.org/show_bug.cgi?id=69189
+
+Reviewed by Simon Fraser.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::handleWheelEvent):
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::wheelEventSyncForTesting):
+* WebProcess/WebPage/WebPage.h:
+* WebProcess/WebPage/WebPage.messages.in:
+Add sync version of wheel event handling for use in testing.
+
 2011-09-30  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
 
 [Qt] Add missing include for QMimeData


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (96438 => 96439)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-09-30 23:54:44 UTC (rev 96438)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-10-01 00:16:48 UTC (rev 96439)
@@ -869,7 +869,13 @@
 m_currentlyProcessedWheelEvents.append(event);
 
 process()-responsivenessTimer()-start();
-process()-send(Messages::WebPage::WheelEvent(event), m_pageID);
+
+if

[webkit-changes] [96440] trunk

2011-09-30 Thread isherman

Title: [96440] trunk








Revision 96440
Author isher...@chromium.org
Date 2011-09-30 17:25:09 -0700 (Fri, 30 Sep 2011)


Log Message
Fix assertion failure in XSS Auditor
https://bugs.webkit.org/show_bug.cgi?id=69050
https://code.google.com/p/chromium/issues/detail?id=97346

Reviewed by Daniel Bates.

Source/WebCore:

Test: fast/forms/xss-auditor-doesnt-crash.html

* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::init): Don't try to decode the HTML body if it is empty.

LayoutTests:

* fast/forms/xss-auditor-doesnt-crash-expected.txt: Added.
* fast/forms/xss-auditor-doesnt-crash.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/parser/XSSAuditor.cpp


Added Paths

trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit-expected.txt
trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html




Diff

Modified: trunk/LayoutTests/ChangeLog (96439 => 96440)

--- trunk/LayoutTests/ChangeLog	2011-10-01 00:16:48 UTC (rev 96439)
+++ trunk/LayoutTests/ChangeLog	2011-10-01 00:25:09 UTC (rev 96440)
@@ -1,3 +1,14 @@
+2011-09-30  Ilya Sherman  isher...@chromium.org
+
+Fix assertion failure in XSS Auditor
+https://bugs.webkit.org/show_bug.cgi?id=69050
+https://code.google.com/p/chromium/issues/detail?id=97346
+
+Reviewed by Daniel Bates.
+
+* fast/forms/xss-auditor-doesnt-crash-expected.txt: Added.
+* fast/forms/xss-auditor-doesnt-crash.html: Added.
+
 2011-09-30  Sam Weinig  s...@webkit.org
 
 Add support for eventSender.mouseScrollBy in WTR


Added: trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit-expected.txt (0 => 96440)

--- trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit-expected.txt	2011-10-01 00:25:09 UTC (rev 96440)
@@ -0,0 +1,4 @@
+This tests that no assertions are thrown when POST submitting a form.
+
+PASS No assertions raised.
+


Added: trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html (0 => 96440)

--- trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html	(rev 0)
+++ trunk/LayoutTests/fast/forms/xss-auditor-doesnt-crash-on-post-submit.html	2011-10-01 00:25:09 UTC (rev 96440)
@@ -0,0 +1,32 @@
+!DOCTYPE html
+html
+head
+script src=""
+script
+function test() {
+if (document.location.hash !== '#submitted') {
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.setXSSAuditorEnabled(true)
+layoutTestController.waitUntilDone();
+}
+
+var form = document.getElementById('form');
+// Shouldn't trigger any assertions.
+form.submit();
+} else {
+testPassed('No assertions raised.');
+if (window.layoutTestController)
+layoutTestController.notifyDone();
+}
+}
+/script
+/head
+body _onload_=test()
+This tests that no assertions are thrown when POST submitting a form.
+form method=post id=form action=""
+input type=text
+/form
+div id=console/div
+/body
+/html


Modified: trunk/Source/WebCore/ChangeLog (96439 => 96440)

--- trunk/Source/WebCore/ChangeLog	2011-10-01 00:16:48 UTC (rev 96439)
+++ trunk/Source/WebCore/ChangeLog	2011-10-01 00:25:09 UTC (rev 96440)
@@ -1,3 +1,16 @@
+2011-09-30  Ilya Sherman  isher...@chromium.org
+
+Fix assertion failure in XSS Auditor
+https://bugs.webkit.org/show_bug.cgi?id=69050
+https://code.google.com/p/chromium/issues/detail?id=97346
+
+Reviewed by Daniel Bates.
+
+Test: fast/forms/xss-auditor-doesnt-crash.html
+
+* html/parser/XSSAuditor.cpp:
+(WebCore::XSSAuditor::init): Don't try to decode the HTML body if it is empty.
+
 2011-09-30  Maciej Stachowiak  m...@apple.com
 
 Loading page on potterybankids causes reproducible assertion failure in debug builds


Modified: trunk/Source/WebCore/html/parser/XSSAuditor.cpp (96439 => 96440)

--- trunk/Source/WebCore/html/parser/XSSAuditor.cpp	2011-10-01 00:16:48 UTC (rev 96439)
+++ trunk/Source/WebCore/html/parser/XSSAuditor.cpp	2011-10-01 00:25:09 UTC (rev 96440)
@@ -239,11 +239,13 @@
 FormData* httpBody = documentLoader-originalRequest().httpBody();
 if (httpBody  !httpBody-isEmpty()) {
 String httpBodyAsString = httpBody-flattenToString();
-m_decodedHTTPBody = fullyDecodeString(httpBodyAsString, decoder);
-if (m_decodedHTTPBody.find(isRequiredForInjection, 0) == notFound)
-m_decodedHTTPBody = String();
-if (m_decodedHTTPBody.length() = miniumLengthForSuffixTree)
-m_decodedHTTPBodySuffixTree = adoptPtr(new SuffixTreeASCIICodebook(m_decodedHTTPBody,

[webkit-changes] [96441] trunk/Tools

2011-09-30 Thread levin

Title: [96441] trunk/Tools








Revision 96441
Author le...@chromium.org
Date 2011-09-30 17:39:52 -0700 (Fri, 30 Sep 2011)


Log Message
watchlist: Add a way to detect a net increase or decrease of a pattern (in a file).
https://bugs.webkit.org/show_bug.cgi?id=69031

Reviewed by Adam Barth.

* Scripts/webkitpy/common/config/watchlist: Added usage of the new pattern,
a comment to explain something important about the email addresses, and
a comment to let emacs know to treat the file as a python file.
* Scripts/webkitpy/common/watchlist/amountchangedpattern.py: Added.
Detects increases or decreases in a pattern.
* Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py: Added.
* Scripts/webkitpy/common/watchlist/watchlist_unittest.py:
Added unit tests for watchlist which has more or less.
* Scripts/webkitpy/common/watchlist/watchlistparser.py:
Added support for more or less.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist_unittest.py
trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py


Added Paths

trunk/Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern.py
trunk/Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (96440 => 96441)

--- trunk/Tools/ChangeLog	2011-10-01 00:25:09 UTC (rev 96440)
+++ trunk/Tools/ChangeLog	2011-10-01 00:39:52 UTC (rev 96441)
@@ -1,3 +1,21 @@
+2011-09-30  David Levin  le...@chromium.org
+
+watchlist: Add a way to detect a net increase or decrease of a pattern (in a file).
+https://bugs.webkit.org/show_bug.cgi?id=69031
+
+Reviewed by Adam Barth.
+
+* Scripts/webkitpy/common/config/watchlist: Added usage of the new pattern,
+a comment to explain something important about the email addresses, and
+a comment to let emacs know to treat the file as a python file.
+* Scripts/webkitpy/common/watchlist/amountchangedpattern.py: Added.
+Detects increases or decreases in a pattern.
+* Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py: Added.
+* Scripts/webkitpy/common/watchlist/watchlist_unittest.py:
+Added unit tests for watchlist which has more or less.
+* Scripts/webkitpy/common/watchlist/watchlistparser.py:
+Added support for more or less.
+
 2011-09-30  Sam Weinig  s...@webkit.org
 
 Add support for eventSender.mouseScrollBy in WTR


Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (96440 => 96441)

--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2011-10-01 00:25:09 UTC (rev 96440)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2011-10-01 00:39:52 UTC (rev 96441)
@@ -1,10 +1,22 @@
+#  -*- mode: Python;-*-
 {
 DEFINITIONS: {
 WatchListScript: {
-filename: (rTools/Scripts/webkitpy/common/watchlist/.*),
+filename: rTools/Scripts/webkitpy/common/watchlist/.*,
 },
+ThreadingFiles: {
+filename: rSource/_javascript_Core/wtf/ThreadSafeRefCounted\.h
+r|Source/_javascript_Core/wtf/Threading\.h,
+},
+ThreadingUsage: {
+more: rdeprecatedTurnOffVerifier|crossThreadString|threadsafeCopy|ThreadSafeRefCounted|CrossThreadRefCounted,
+},
 },
 CC_RULES: {
+# Note: All email addresses listed must be registered with bugzilla.
+# Specifically, le...@chromium.org and levin+thread...@chromium.org are
+# two different accounts as far as bugzilla is concerned.
 WatchListScript: [ levin+watchl...@chromium.org, ],
+ThreadingFiles|ThreadingUsage: [ levin+thread...@chromium.org, ],
 },
 }


Added: trunk/Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern.py (0 => 96441)

--- trunk/Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern.py	(rev 0)
+++ trunk/Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern.py	2011-10-01 00:39:52 UTC (rev 96441)
@@ -0,0 +1,73 @@
+# Copyright (C) 2011 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES,

[webkit-changes] [96442] trunk/Source/WebCore

2011-09-30 Thread abarth

Title: [96442] trunk/Source/WebCore








Revision 96442
Author aba...@webkit.org
Date 2011-09-30 17:46:50 -0700 (Fri, 30 Sep 2011)


Log Message
Unreviewed, rolling out r96426.
http://trac.webkit.org/changeset/96426
https://bugs.webkit.org/show_bug.cgi?id=69199

Broke a zillion image results on Chromium Skia Mac (Requested
by abarth|gardener on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2011-09-30

* platform/graphics/skia/GraphicsContextSkia.cpp:
(WebCore::getFocusRingOutset):
(WebCore::GraphicsContext::drawFocusRing):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (96441 => 96442)

--- trunk/Source/WebCore/ChangeLog	2011-10-01 00:39:52 UTC (rev 96441)
+++ trunk/Source/WebCore/ChangeLog	2011-10-01 00:46:50 UTC (rev 96442)
@@ -1,3 +1,16 @@
+2011-09-30  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r96426.
+http://trac.webkit.org/changeset/96426
+https://bugs.webkit.org/show_bug.cgi?id=69199
+
+Broke a zillion image results on Chromium Skia Mac (Requested
+by abarth|gardener on #webkit).
+
+* platform/graphics/skia/GraphicsContextSkia.cpp:
+(WebCore::getFocusRingOutset):
+(WebCore::GraphicsContext::drawFocusRing):
+
 2011-09-30  Ilya Sherman  isher...@chromium.org
 
 Fix assertion failure in XSS Auditor


Modified: trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (96441 => 96442)

--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2011-10-01 00:39:52 UTC (rev 96441)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp	2011-10-01 00:46:50 UTC (rev 96442)
@@ -538,10 +538,10 @@
 #endif
 }
 
-static inline SkScalar getFocusRingOutset()
+static inline SkScalar getFocusRingOutset(int width)
 {
 #if PLATFORM(CHROMIUM)  OS(DARWIN)
-return 0.75f;
+return (width * 0.5f) + 0.25f;
 #else
 return 0.5f;
 #endif
@@ -557,7 +557,7 @@
 return;
 
 SkRegion focusRingRegion;
-const SkScalar focusRingOutset = getFocusRingOutset();
+const SkScalar focusRingOutset = getFocusRingOutset(width);
 for (unsigned i = 0; i  rectCount; i++) {
 SkIRect r = rects[i];
 r.inset(-focusRingOutset, -focusRingOutset);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96443] trunk/Source/JavaScriptCore

2011-09-30 Thread fpizlo

Title: [96443] trunk/Source/_javascript_Core








Revision 96443
Author fpi...@apple.com
Date 2011-09-30 17:58:15 -0700 (Fri, 30 Sep 2011)


Log Message
DFG does not speculate aggressively enough on put_by_id
https://bugs.webkit.org/show_bug.cgi?id=69114

Reviewed by Oliver Hunt.

This adds new nodes along with optimizations for those nodes:

GetPropertyStorage: CheckStructure used to do both the structure
check and retrieve the storage pointer. Now CheckStructure just
checks the structure, and GetPropertyStorage retrieves the
storage pointer.

PutStructure: Changes the structure, and has the expected store
to load optimization with CheckStructure.

PutByOffset: Directly sets the value. Has store to load
optimization with GetByOffset.

* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::cellConstant):
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::dump):
* dfg/DFGJITCodeGenerator.cpp:
(JSC::DFG::JITCodeGenerator::writeBarrier):
* dfg/DFGJITCodeGenerator.h:
* dfg/DFGNode.h:
(JSC::DFG::Node::hasStructure):
(JSC::DFG::Node::hasStorageAccessData):
* dfg/DFGPropagator.cpp:
(JSC::DFG::Propagator::propagateNodePredictions):
(JSC::DFG::Propagator::impureCSE):
(JSC::DFG::Propagator::checkStructureLoadElimination):
(JSC::DFG::Propagator::getByOffsetLoadElimination):
(JSC::DFG::Propagator::getPropertyStorageLoadElimination):
(JSC::DFG::Propagator::eliminate):
(JSC::DFG::Propagator::performNodeCSE):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp
trunk/Source/_javascript_Core/dfg/DFGGraph.cpp
trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.cpp
trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h
trunk/Source/_javascript_Core/dfg/DFGNode.h
trunk/Source/_javascript_Core/dfg/DFGPropagator.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96442 => 96443)

--- trunk/Source/_javascript_Core/ChangeLog	2011-10-01 00:46:50 UTC (rev 96442)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-01 00:58:15 UTC (rev 96443)
@@ -1,3 +1,47 @@
+2011-09-30  Filip Pizlo  fpi...@apple.com
+
+DFG does not speculate aggressively enough on put_by_id
+https://bugs.webkit.org/show_bug.cgi?id=69114
+
+Reviewed by Oliver Hunt.
+
+This adds new nodes along with optimizations for those nodes:
+
+GetPropertyStorage: CheckStructure used to do both the structure
+check and retrieve the storage pointer. Now CheckStructure just
+checks the structure, and GetPropertyStorage retrieves the
+storage pointer.
+
+PutStructure: Changes the structure, and has the expected store
+to load optimization with CheckStructure.
+
+PutByOffset: Directly sets the value. Has store to load
+optimization with GetByOffset.
+
+* dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::ByteCodeParser::cellConstant):
+(JSC::DFG::ByteCodeParser::parseBlock):
+* dfg/DFGGraph.cpp:
+(JSC::DFG::Graph::dump):
+* dfg/DFGJITCodeGenerator.cpp:
+(JSC::DFG::JITCodeGenerator::writeBarrier):
+* dfg/DFGJITCodeGenerator.h:
+* dfg/DFGNode.h:
+(JSC::DFG::Node::hasStructure):
+(JSC::DFG::Node::hasStorageAccessData):
+* dfg/DFGPropagator.cpp:
+(JSC::DFG::Propagator::propagateNodePredictions):
+(JSC::DFG::Propagator::impureCSE):
+(JSC::DFG::Propagator::checkStructureLoadElimination):
+(JSC::DFG::Propagator::getByOffsetLoadElimination):
+(JSC::DFG::Propagator::getPropertyStorageLoadElimination):
+(JSC::DFG::Propagator::eliminate):
+(JSC::DFG::Propagator::performNodeCSE):
+* dfg/DFGSpeculativeJIT32_64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+
 2011-09-30  Gavin Barraclough  barraclo...@apple.com
 
 StringRecursionChecker should not work in terms of EncodedJSValue


Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (96442 => 96443)

--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2011-10-01 00:46:50 UTC (rev 96442)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2011-10-01 00:58:15 UTC (rev 96443)
@@ -30,6 +30,7 @@
 
 #include DFGCapabilities.h
 #include CodeBlock.h
+#include wtf/HashMap.h
 #include wtf/MathExtras.h
 
 namespace JSC { namespace DFG {
@@ -404,6 +405,19 @@
 return getJSConstant(m_constantNaN);
 }
 
+NodeIndex cellConstant(JSCell* cell)
+{
+HashMapJSCell*, unsigned::iterator iter = m_cellConstants.find(cell);
+if (iter != m_cellConstants.end())
+

[webkit-changes] [96444] trunk/Tools

2011-09-30 Thread levin

Title: [96444] trunk/Tools








Revision 96444
Author le...@chromium.org
Date 2011-09-30 18:08:15 -0700 (Fri, 30 Sep 2011)


Log Message
watchlist: Add webkit-patch command to run watchlist.
https://bugs.webkit.org/show_bug.cgi?id=68973

Reviewed by Eric Seidel.

* Scripts/webkitpy/common/host.py: Exposed the watch_list.
* Scripts/webkitpy/common/watchlist/watchlist.py: Changed to return
the cc and messages as sorted lists. To allow for deterministic ordering.
* Scripts/webkitpy/common/watchlist/watchlist_unittest.py: Ditto.
* Scripts/webkitpy/tool/commands/__init__.py: Add ApplyWatchListLocal so
that it will be exposed as a command by webkit-patch.
* Scripts/webkitpy/tool/commands/applywatchlistlocal.py: Added.
* Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py: Added.
* Scripts/webkitpy/tool/commands/download.py: Added ApplyWatchList which mimics CheckStyle.
* Scripts/webkitpy/tool/commands/download_unittest.py: Added an appropriate test.
* Scripts/webkitpy/tool/mocktool.py: Mock out the watch list.
* Scripts/webkitpy/tool/steps/__init__.py: Added ApplyWatchList.
* Scripts/webkitpy/tool/steps/applywatchlist.py: Added.
* Scripts/webkitpy/tool/steps/applywatchlist_unittest.py: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/host.py
trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist.py
trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist_unittest.py
trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py
trunk/Tools/Scripts/webkitpy/tool/commands/download.py
trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py
trunk/Tools/Scripts/webkitpy/tool/mocktool.py
trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py


Added Paths

trunk/Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal.py
trunk/Tools/Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py
trunk/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py
trunk/Tools/Scripts/webkitpy/tool/steps/applywatchlist_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (96443 => 96444)

--- trunk/Tools/ChangeLog	2011-10-01 00:58:15 UTC (rev 96443)
+++ trunk/Tools/ChangeLog	2011-10-01 01:08:15 UTC (rev 96444)
@@ -1,3 +1,25 @@
+2011-09-29  David Levin  le...@chromium.org
+
+watchlist: Add webkit-patch command to run watchlist.
+https://bugs.webkit.org/show_bug.cgi?id=68973
+
+Reviewed by Eric Seidel.
+
+* Scripts/webkitpy/common/host.py: Exposed the watch_list.
+* Scripts/webkitpy/common/watchlist/watchlist.py: Changed to return
+the cc and messages as sorted lists. To allow for deterministic ordering.
+* Scripts/webkitpy/common/watchlist/watchlist_unittest.py: Ditto.
+* Scripts/webkitpy/tool/commands/__init__.py: Add ApplyWatchListLocal so
+that it will be exposed as a command by webkit-patch.
+* Scripts/webkitpy/tool/commands/applywatchlistlocal.py: Added.
+* Scripts/webkitpy/tool/commands/applywatchlistlocal_unittest.py: Added.
+* Scripts/webkitpy/tool/commands/download.py: Added ApplyWatchList which mimics CheckStyle.
+* Scripts/webkitpy/tool/commands/download_unittest.py: Added an appropriate test.
+* Scripts/webkitpy/tool/mocktool.py: Mock out the watch list.
+* Scripts/webkitpy/tool/steps/__init__.py: Added ApplyWatchList.
+* Scripts/webkitpy/tool/steps/applywatchlist.py: Added.
+* Scripts/webkitpy/tool/steps/applywatchlist_unittest.py: Added.
+
 2011-09-30  David Levin  le...@chromium.org
 
 watchlist: Add a way to detect a net increase or decrease of a pattern (in a file).


Modified: trunk/Tools/Scripts/webkitpy/common/host.py (96443 => 96444)

--- trunk/Tools/Scripts/webkitpy/common/host.py	2011-10-01 00:58:15 UTC (rev 96443)
+++ trunk/Tools/Scripts/webkitpy/common/host.py	2011-10-01 01:08:15 UTC (rev 96444)
@@ -36,6 +36,7 @@
 from webkitpy.common.net.buildbot.chromiumbuildbot import ChromiumBuildBot
 from webkitpy.common.net.irc import ircproxy
 from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
+from webkitpy.common.watchlist.watchlistloader import WatchListLoader
 from webkitpy.layout_tests.port.factory import PortFactory
 
 
@@ -76,6 +77,10 @@
 def chromium_buildbot(self):
 return ChromiumBuildBot()
 
+@memoized
+def watch_list(self):
+return WatchListLoader(self.filesystem).load()
+
 def ensure_irc_connected(self, irc_delegate):
 if not self._irc:
 self._irc = ircproxy.IRCProxy(irc_delegate)


Modified: trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist.py (96443 => 96444)

--- trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist.py	2011-10-01 00:58:15 UTC (rev 96443)
+++ trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist.py	2011-10-01 01:08:15 UTC (rev 96444)
@@ -58,17 +58,18 @@
 for rule in rules:
 if rule.match(matching_definitions):
 instructions.update(rule.instructions())
-return

[webkit-changes] [96445] trunk/Source/WebCore

2011-09-30 Thread abarth

Title: [96445] trunk/Source/WebCore








Revision 96445
Author aba...@webkit.org
Date 2011-09-30 18:17:06 -0700 (Fri, 30 Sep 2011)


Log Message
Remove ASSERT introduced in http://trac.webkit.org/changeset/96427
which is triggering all over the place.

Sorting this out is covered in this bug:
https://bugs.webkit.org/show_bug.cgi?id=69200

* rendering/RenderView.cpp:
(WebCore::RenderView::layout):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderView.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (96444 => 96445)

--- trunk/Source/WebCore/ChangeLog	2011-10-01 01:08:15 UTC (rev 96444)
+++ trunk/Source/WebCore/ChangeLog	2011-10-01 01:17:06 UTC (rev 96445)
@@ -1,3 +1,14 @@
+2011-09-30  Adam Barth  aba...@webkit.org
+
+Remove ASSERT introduced in http://trac.webkit.org/changeset/96427
+which is triggering all over the place.
+
+Sorting this out is covered in this bug:
+https://bugs.webkit.org/show_bug.cgi?id=69200
+
+* rendering/RenderView.cpp:
+(WebCore::RenderView::layout):
+
 2011-09-30  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r96426.


Modified: trunk/Source/WebCore/rendering/RenderView.cpp (96444 => 96445)

--- trunk/Source/WebCore/rendering/RenderView.cpp	2011-10-01 01:08:15 UTC (rev 96444)
+++ trunk/Source/WebCore/rendering/RenderView.cpp	2011-10-01 01:17:06 UTC (rev 96445)
@@ -142,10 +142,6 @@
 ASSERT(m_layoutState == state);
 m_layoutState = 0;
 setNeedsLayout(false);
-#if !ASSERT_DISABLED
-for (RenderObject* renderer = this; renderer; renderer = renderer-nextInPreOrder())
-ASSERT(!renderer-needsLayout());
-#endif
 }
 
 void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState transformState, bool* wasFixed) const






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96446] trunk/Source

2011-09-30 Thread barraclough

Title: [96446] trunk/Source








Revision 96446
Author barraclo...@apple.com
Date 2011-09-30 18:29:34 -0700 (Fri, 30 Sep 2011)


Log Message
Remove toStrictThisObject, toThisString, toThisJSString
https://bugs.webkit.org/show_bug.cgi?id=69203

Rubber stamped by Sam Weinig

These are no longer used.

../_javascript_Core: 

* _javascript_Core.exp:
* runtime/JSActivation.cpp:
* runtime/JSActivation.h:
* runtime/JSObject.cpp:
* runtime/JSObject.h:
* runtime/JSStaticScopeObject.cpp:
* runtime/JSStaticScopeObject.h:
* runtime/JSValue.h:
* runtime/StrictEvalActivation.cpp:
* runtime/StrictEvalActivation.h:

../WebCore: 

* bindings/js/JSDOMWindowBase.cpp:
* bindings/js/JSDOMWindowBase.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.exp
trunk/Source/_javascript_Core/runtime/JSActivation.cpp
trunk/Source/_javascript_Core/runtime/JSActivation.h
trunk/Source/_javascript_Core/runtime/JSObject.cpp
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.cpp
trunk/Source/_javascript_Core/runtime/JSStaticScopeObject.h
trunk/Source/_javascript_Core/runtime/JSValue.h
trunk/Source/_javascript_Core/runtime/StrictEvalActivation.cpp
trunk/Source/_javascript_Core/runtime/StrictEvalActivation.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96445 => 96446)

--- trunk/Source/_javascript_Core/ChangeLog	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-01 01:29:34 UTC (rev 96446)
@@ -1,3 +1,23 @@
+2011-09-30  Gavin Barraclough  barraclo...@apple.com
+
+Remove toStrictThisObject, toThisString, toThisJSString
+https://bugs.webkit.org/show_bug.cgi?id=69203
+
+Rubber stamped by Sam Weinig
+
+These are no longer used.
+
+* _javascript_Core.exp:
+* runtime/JSActivation.cpp:
+* runtime/JSActivation.h:
+* runtime/JSObject.cpp:
+* runtime/JSObject.h:
+* runtime/JSStaticScopeObject.cpp:
+* runtime/JSStaticScopeObject.h:
+* runtime/JSValue.h:
+* runtime/StrictEvalActivation.cpp:
+* runtime/StrictEvalActivation.h:
+
 2011-09-30  Filip Pizlo  fpi...@apple.com
 
 DFG does not speculate aggressively enough on put_by_id


Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (96445 => 96446)

--- trunk/Source/_javascript_Core/_javascript_Core.exp	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp	2011-10-01 01:29:34 UTC (rev 96446)
@@ -572,7 +572,6 @@
 __ZNK3JSC8JSObject11hasPropertyEPNS_9ExecStateEj
 __ZNK3JSC8JSObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
 __ZNK3JSC8JSObject12toThisObjectEPNS_9ExecStateE
-__ZNK3JSC8JSObject18toStrictThisObjectEPNS_9ExecStateE
 __ZNK3JSC8JSObject8toNumberEPNS_9ExecStateE
 __ZNK3JSC8JSObject8toStringEPNS_9ExecStateE
 __ZNK3JSC8JSObject9classNameEv


Modified: trunk/Source/_javascript_Core/runtime/JSActivation.cpp (96445 => 96446)

--- trunk/Source/_javascript_Core/runtime/JSActivation.cpp	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.cpp	2011-10-01 01:29:34 UTC (rev 96446)
@@ -206,11 +206,6 @@
 return exec-globalThisValue();
 }
 
-JSValue JSActivation::toStrictThisObject(ExecState*) const
-{
-return jsNull();
-}
-
 bool JSActivation::isDynamicScope(bool requiresDynamicChecks) const
 {
 requiresDynamicChecks = m_requiresDynamicChecks;


Modified: trunk/Source/_javascript_Core/runtime/JSActivation.h (96445 => 96446)

--- trunk/Source/_javascript_Core/runtime/JSActivation.h	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.h	2011-10-01 01:29:34 UTC (rev 96446)
@@ -70,7 +70,6 @@
 virtual bool deleteProperty(ExecState*, const Identifier propertyName);
 
 virtual JSObject* toThisObject(ExecState*) const;
-virtual JSValue toStrictThisObject(ExecState*) const;
 
 void copyRegisters(JSGlobalData);
 


Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (96445 => 96446)

--- trunk/Source/_javascript_Core/runtime/JSObject.cpp	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp	2011-10-01 01:29:34 UTC (rev 96446)
@@ -517,11 +517,6 @@
 return const_castJSObject*(this);
 }
 
-JSValue JSObject::toStrictThisObject(ExecState*) const
-{
-return const_castJSObject*(this);
-}
-
 JSObject* JSObject::unwrappedObject()
 {
 return this;


Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (96445 => 96446)

--- trunk/Source/_javascript_Core/runtime/JSObject.h	2011-10-01 01:17:06 UTC (rev 96445)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h	2011-10-01 01:29:34 UTC (rev 96446)
@@ -138,7 +138,6 @@
 virtual UString toString(ExecState*) const;

[webkit-changes] [96447] trunk/LayoutTests

2011-09-30 Thread abarth

Title: [96447] trunk/LayoutTests








Revision 96447
Author aba...@webkit.org
Date 2011-09-30 18:37:02 -0700 (Fri, 30 Sep 2011)


Log Message
Update baseline for this test on Leopard.

* platform/chromium-cg-mac-leopard/fast/text/complex-synthetic-bold-space-width-expected.png: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium-cg-mac-leopard/fast/text/complex-synthetic-bold-space-width-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (96446 => 96447)

--- trunk/LayoutTests/ChangeLog	2011-10-01 01:29:34 UTC (rev 96446)
+++ trunk/LayoutTests/ChangeLog	2011-10-01 01:37:02 UTC (rev 96447)
@@ -1,3 +1,9 @@
+2011-09-30  Adam Barth  aba...@webkit.org
+
+Update baseline for this test on Leopard.
+
+* platform/chromium-cg-mac-leopard/fast/text/complex-synthetic-bold-space-width-expected.png: Added.
+
 2011-09-30  Ilya Sherman  isher...@chromium.org
 
 Fix assertion failure in XSS Auditor


Added: trunk/LayoutTests/platform/chromium-cg-mac-leopard/fast/text/complex-synthetic-bold-space-width-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/chromium-cg-mac-leopard/fast/text/complex-synthetic-bold-space-width-expected.png
___

Added: svn:mime-type




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96448] trunk/Tools

2011-09-30 Thread dbates

Title: [96448] trunk/Tools








Revision 96448
Author dba...@webkit.org
Date 2011-09-30 18:40:31 -0700 (Fri, 30 Sep 2011)


Log Message
Cleanup: Extract code to launch a Mac WebKit application into a common function
https://bugs.webkit.org/show_bug.cgi?id=68662

Reviewed by Adam Roben.

Extracts common code to launch a WebKit application on Mac OS X into a function
so that we can remove duplicate code.

* Scripts/run-webkit-app: Modified to use webkitdirs::runMacWebKitApp().
* Scripts/webkitdirs.pm: Sorted @EXPORT list and added constant USE_OPEN_COMMAND.
(runMacWebKitApp): Added.
(runSafari): Modified to use webkitdirs::runMacWebKitApp().
(runMiniBrowser): Ditto.
(runWebKitTestRunner): Ditto.
(runTestWebKitAPI): Ditto.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-webkit-app
trunk/Tools/Scripts/webkitdirs.pm




Diff

Modified: trunk/Tools/ChangeLog (96447 => 96448)

--- trunk/Tools/ChangeLog	2011-10-01 01:37:02 UTC (rev 96447)
+++ trunk/Tools/ChangeLog	2011-10-01 01:40:31 UTC (rev 96448)
@@ -1,3 +1,21 @@
+2011-09-30  Daniel Bates  dba...@rim.com
+
+Cleanup: Extract code to launch a Mac WebKit application into a common function
+https://bugs.webkit.org/show_bug.cgi?id=68662
+
+Reviewed by Adam Roben.
+
+Extracts common code to launch a WebKit application on Mac OS X into a function
+so that we can remove duplicate code.
+
+* Scripts/run-webkit-app: Modified to use webkitdirs::runMacWebKitApp().
+* Scripts/webkitdirs.pm: Sorted @EXPORT list and added constant USE_OPEN_COMMAND.
+(runMacWebKitApp): Added.
+(runSafari): Modified to use webkitdirs::runMacWebKitApp().
+(runMiniBrowser): Ditto.
+(runWebKitTestRunner): Ditto.
+(runTestWebKitAPI): Ditto.
+
 2011-09-29  David Levin  le...@chromium.org
 
 watchlist: Add webkit-patch command to run watchlist.


Modified: trunk/Tools/Scripts/run-webkit-app (96447 => 96448)

--- trunk/Tools/Scripts/run-webkit-app	2011-10-01 01:37:02 UTC (rev 96447)
+++ trunk/Tools/Scripts/run-webkit-app	2011-10-01 01:40:31 UTC (rev 96448)
@@ -34,17 +34,11 @@
 use webkitdirs;
 
 setConfiguration();
-my $productDir = productDir();
 
 die Did not specify an application to open (e.g. run-webkit-app AppName).\n unless length($ARGV[0])  0;
 
 # Check to see that all the frameworks are built.
 checkFrameworks();
 
-# Set up DYLD_FRAMEWORK_PATH to point to the product directory.
-print Start $ARGV[0] with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n;
-$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
-$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = YES;
-
-unshift(@ARGV, -a);
-exec open, @ARGV;
+my $appPath = shift(@ARGV);
+exit exitStatus(runMacWebKitApp($appPath, USE_OPEN_COMMAND));


Modified: trunk/Tools/Scripts/webkitdirs.pm (96447 => 96448)

--- trunk/Tools/Scripts/webkitdirs.pm	2011-10-01 01:37:02 UTC (rev 96447)
+++ trunk/Tools/Scripts/webkitdirs.pm	2011-10-01 01:40:31 UTC (rev 96448)
@@ -43,11 +43,27 @@
our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
$VERSION = 1.00;
@ISA = qw(Exporter);
-   @EXPORT  = qw(chdirWebKit baseProductDir productDir XcodeOptions XcodeOptionString XcodeOptionStringNoConfig passedConfiguration setConfiguration safariPath checkFrameworks currentSVNRevision);
+   @EXPORT  = qw(
+   XcodeOptionString
+   XcodeOptionStringNoConfig
+   XcodeOptions
+   baseProductDir
+   chdirWebKit
+   checkFrameworks
+   currentSVNRevision
+   passedConfiguration
+   productDir
+   runMacWebKitApp
+   safariPath
+   setConfiguration
+   USE_OPEN_COMMAND
+   );
%EXPORT_TAGS = ( );
@EXPORT_OK   = ();
 }
 
+use constant USE_OPEN_COMMAND = 1; # Used in runMacWebKitApp().
+
 our @EXPORT_OK;
 
 my $architecture;
@@ -2000,22 +2016,31 @@
 }
 }
 
+sub runMacWebKitApp($;$)
+{
+my ($appPath, $useOpenCommand) = @_;
+my $productDir = productDir();
+print Starting @{[basename($appPath)]} with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n;
+$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = YES;
+if ($useOpenCommand == USE_OPEN_COMMAND) {
+return system(open, -W, -a, $appPath, --args, @ARGV);
+}
+if (architecture()) {
+return system arch, - . architecture(), $appPath, @ARGV;
+}
+return system { $appPath } $appPath, @ARGV;
+}
+
 sub runSafari
 {
 my ($debugger) = @_;
 
 if (isAppleMacWebKit()) {
-return system $FindBin::Bin/gdb-safari, argumentsForConfiguration() if $debugger;
-
-my $productDir = productDir();
-print Starting Safari with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n;
-$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
-$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = YES;
-if (architecture()) {
-return system arch, - . architecture(), safariPath(), @ARGV;
-} else

[webkit-changes] [96449] trunk

2011-09-30 Thread commit-queue

Title: [96449] trunk








Revision 96449
Author commit-qu...@webkit.org
Date 2011-09-30 18:43:20 -0700 (Fri, 30 Sep 2011)


Log Message
Implement currentColor support for CSS gradients
https://bugs.webkit.org/show_bug.cgi?id=58730

Patch by David Barr davidb...@chromium.org on 2011-09-30
Reviewed by Adam Barth.

Source/WebCore:

Allow currentColor as a CSS3 gradient color-stop.

Test: fast/css/linear-gradient-currentcolor.html

* css/CSSGradientValue.cpp:
(WebCore::CSSGradientValue::isCacheable): Make currentColor uncacheable since the
background image may be invalidated if currentColor is used as a gradient stop and
the value of the 'color' property changes.
* css/CSSParser.cpp:
(WebCore::parseGradientColorOrKeyword): Accept the currentColor keyword.
* rendering/style/StyleGeneratedImage.cpp:
(WebCore::StyleGeneratedImage::image): Initialize document styleSelector so that
currentColor may be computed for a StyleGeneratedImage.

LayoutTests:

* fast/css/linear-gradient-currentcolor-expected.txt: Added.
* fast/css/linear-gradient-currentcolor.html: Added.
* platform/chromium/test_expectations.txt:
* platform/mac/fast/css/linear-gradient-currentcolor-expected.png: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSGradientValue.cpp
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp


Added Paths

trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt
trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html
trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (96448 => 96449)

--- trunk/LayoutTests/ChangeLog	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/LayoutTests/ChangeLog	2011-10-01 01:43:20 UTC (rev 96449)
@@ -1,3 +1,15 @@
+2011-09-30  David Barr  davidb...@chromium.org
+
+Implement currentColor support for CSS gradients
+https://bugs.webkit.org/show_bug.cgi?id=58730
+
+Reviewed by Adam Barth.
+
+* fast/css/linear-gradient-currentcolor-expected.txt: Added.
+* fast/css/linear-gradient-currentcolor.html: Added.
+* platform/chromium/test_expectations.txt:
+* platform/mac/fast/css/linear-gradient-currentcolor-expected.png: Added.
+
 2011-09-30  Adam Barth  aba...@webkit.org
 
 Update baseline for this test on Leopard.


Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt (0 => 96449)

--- trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1 @@
+


Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html (0 => 96449)

--- trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html	(rev 0)
+++ trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1,24 @@
+html
+head
+style
+div {
+background-color: red;
+background-image: -moz-linear-gradient(gray 50px, currentColor 50px);
+background-image: -ms-linear-gradient(gray 50px, currentColor 50px);
+background-image: -o-linear-gradient(gray 50px, currentColor 50px);
+background-image: -webkit-linear-gradient(gray 50px, currentColor 50px);
+background-image: linear-gradient(gray 50px, currentColor 50px);
+	width: 100px;
+	height: 100px;
+}
+/style
+/head
+script
+if (window.layoutTestController)
+window.layoutTestController.dumpAsText(true);
+/script
+body
+  div style=color: green/div
+  div style=color: blue/div
+/body
+/html


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (96448 => 96449)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-01 01:43:20 UTC (rev 96449)
@@ -2531,6 +2531,9 @@
 BUGWK55745 MAC : fast/gradients/css3-radial-gradients3.html = IMAGE
 BUGWK55745 MAC : fast/gradients/css3-repeating-radial-gradients.html = IMAGE
 
+// New pixel tests added for bug 58730, rebaseline when webkit 58730 rolls.
+BUGWK58730 WIN LINUX: fast/css/linear-gradient-currentcolor.html = IMAGE
+
 // This was introduced by r75077.
 BUGWK52082 LEOPARD : fast/text/basic/014.html = IMAGE
 BUGWK52082 LEOPARD : fast/text/midword-break-after-breakable-char.html = IMAGE


Added: trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png (0 => 96449)

--- trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png	(rev 0)
+++ trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1,9 @@
+\x89PNG
+
+
+IHDR

[webkit-changes] [96450] trunk/Source/WebKit/chromium

2011-09-30 Thread commit-queue

Title: [96450] trunk/Source/WebKit/chromium








Revision 96450
Author commit-qu...@webkit.org
Date 2011-09-30 19:12:06 -0700 (Fri, 30 Sep 2011)


Log Message
Adding unit tests for LayerChromium.  Emphasis on verifying
behavior of notifySyncRequired callback and tree manipulations.
https://bugs.webkit.org/show_bug.cgi?id=68572

Patch by Shawn Singh shawnsi...@chromium.org on 2011-09-30
Reviewed by James Robinson.

* WebKit.gypi:
* tests/LayerChromiumTest.cpp: Added.

Modified Paths

trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/WebKit.gypi


Added Paths

trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp




Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (96449 => 96450)

--- trunk/Source/WebKit/chromium/ChangeLog	2011-10-01 01:43:20 UTC (rev 96449)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-10-01 02:12:06 UTC (rev 96450)
@@ -1,3 +1,14 @@
+2011-09-30  Shawn Singh  shawnsi...@chromium.org
+
+Adding unit tests for LayerChromium.  Emphasis on verifying
+behavior of notifySyncRequired callback and tree manipulations.
+https://bugs.webkit.org/show_bug.cgi?id=68572
+
+Reviewed by James Robinson.
+
+* WebKit.gypi:
+* tests/LayerChromiumTest.cpp: Added.
+
 2011-09-30  James Robinson  jam...@chromium.org
 
 [chromium] Pass a processed bool in WebCompositorClient::didHandleInputEvent to indicate if the event was processed


Modified: trunk/Source/WebKit/chromium/WebKit.gypi (96449 => 96450)

--- trunk/Source/WebKit/chromium/WebKit.gypi	2011-10-01 01:43:20 UTC (rev 96449)
+++ trunk/Source/WebKit/chromium/WebKit.gypi	2011-10-01 02:12:06 UTC (rev 96450)
@@ -64,6 +64,7 @@
 'tests/InnerGestureRecognizerTest.cpp',
 'tests/KeyboardTest.cpp',
 'tests/KURLTest.cpp',
+'tests/LayerChromiumTest.cpp',
 'tests/MockGraphicsContext3DTest.cpp',
 'tests/MockWebGraphicsContext3D.h',
 'tests/PODArenaTest.cpp',


Added: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (0 => 96450)

--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	(rev 0)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp	2011-10-01 02:12:06 UTC (rev 96450)
@@ -0,0 +1,665 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1.  Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include config.h
+
+#include LayerChromium.h
+
+#include gmock/gmock.h
+#include gtest/gtest.h
+
+using namespace WebCore;
+using ::testing::Mock;
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::AnyNumber;
+
+#define EXECUTE_AND_VERIFY_NOTIFY_SYNC_BEHAVIOR(delegate, numTimesExpectedNotifySync, codeToTest) \
+EXPECT_CALL((delegate), notifySyncRequired()).Times((numTimesExpectedNotifySync)); \
+codeToTest; \
+Mock::VerifyAndClearExpectations((delegate))
+
+namespace {
+
+class MockLayerDelegate : public CCLayerDelegate {
+public:
+MOCK_CONST_METHOD0(drawsContent, bool());
+MOCK_CONST_METHOD0(preserves3D, bool());
+MOCK_METHOD2(paintContents, void(GraphicsContext, const IntRect));
+MOCK_METHOD0(notifySyncRequired, void());
+};
+
+class LayerChromiumWithInstrumentedDestructor : public LayerChromium {
+public:
+explicit LayerChromiumWithInstrumentedDestructor(CCLayerDelegate* delegate)
+: LayerChromium(delegate)
+{
+}
+
+virtual ~LayerChromiumWithInstrumentedDestructor()
+{
+s_numInstancesDestroyed++;
+}
+
+static int getNumInstancesDestroyed() { return s_numInstancesDestroyed; }
+static void resetNumInstancesDestroyed() { s_numInstancesDestroyed = 0; }
+
+private:

[webkit-changes] [96451] trunk/Source/JavaScriptCore

2011-09-30 Thread commit-queue

Title: [96451] trunk/Source/_javascript_Core








Revision 96451
Author commit-qu...@webkit.org
Date 2011-09-30 19:14:36 -0700 (Fri, 30 Sep 2011)


Log Message
DFG operation results are not set correctly in JSVALUE32_64 DFG JIT
https://bugs.webkit.org/show_bug.cgi?id=69126

Patch by Yuqiang Xian yuqiang.x...@intel.com on 2011-09-30
Reviewed by Gavin Barraclough.

The setupResults routine has the bug of reversing the source and destination.
Also some other trivial (but stupid) bugs need to be fixed in JSVALUE32_64 DFG JIT.

* dfg/DFGJITCodeGenerator.h:
(JSC::DFG::setupTwoStubArgs):
(JSC::DFG::setupResults):
* dfg/DFGJITCodeGenerator32_64.cpp:
(JSC::DFG::JITCodeGenerator::fillJSValue):
(JSC::DFG::JITCodeGenerator::nonSpeculativeValueToInt32):
(JSC::DFG::JITCodeGenerator::nonSpeculativeNonPeepholeCompare):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h
trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator32_64.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96450 => 96451)

--- trunk/Source/_javascript_Core/ChangeLog	2011-10-01 02:12:06 UTC (rev 96450)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-01 02:14:36 UTC (rev 96451)
@@ -1,3 +1,21 @@
+2011-09-30  Yuqiang Xian  yuqiang.x...@intel.com
+
+DFG operation results are not set correctly in JSVALUE32_64 DFG JIT
+https://bugs.webkit.org/show_bug.cgi?id=69126
+
+Reviewed by Gavin Barraclough.
+
+The setupResults routine has the bug of reversing the source and destination. 
+Also some other trivial (but stupid) bugs need to be fixed in JSVALUE32_64 DFG JIT.
+
+* dfg/DFGJITCodeGenerator.h:
+(JSC::DFG::setupTwoStubArgs):
+(JSC::DFG::setupResults):
+* dfg/DFGJITCodeGenerator32_64.cpp:
+(JSC::DFG::JITCodeGenerator::fillJSValue):
+(JSC::DFG::JITCodeGenerator::nonSpeculativeValueToInt32):
+(JSC::DFG::JITCodeGenerator::nonSpeculativeNonPeepholeCompare):
+
 2011-09-30  Gavin Barraclough  barraclo...@apple.com
 
 Remove toStrictThisObject, toThisString, toThisJSString


Modified: trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h (96450 => 96451)

--- trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h	2011-10-01 02:12:06 UTC (rev 96450)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator.h	2011-10-01 02:14:36 UTC (rev 96451)
@@ -921,6 +921,7 @@
 m_generationInfo[node.virtualRegister()].initConstant(nodeIndex, node.refCount());
 }
 
+#if CPU(X86_64)
 // These methods used to sort arguments into the correct registers.
 templateGPRReg destA, GPRReg destB
 void setupTwoStubArgs(GPRReg srcA, GPRReg srcB)
@@ -950,7 +951,6 @@
 } else
 m_jit.swap(destA, destB);
 }
-#if CPU(X86_64)
 templateFPRReg destA, FPRReg destB
 void setupTwoStubArgs(FPRReg srcA, FPRReg srcB)
 {
@@ -1182,7 +1182,21 @@
 
 void setupResults(GPRReg tag, GPRReg payload)
 {
-setupTwoStubArgsGPRInfo::returnValueGPR, GPRInfo::returnValueGPR2(payload, tag);
+GPRReg srcA = GPRInfo::returnValueGPR;
+GPRReg srcB = GPRInfo::returnValueGPR2;
+GPRReg destA = payload;
+GPRReg destB = tag;
+
+if (srcB != destA) {
+// Handle the easy cases - two simple moves.
+m_jit.move(srcA, destA);
+m_jit.move(srcB, destB);
+} else if (srcA != destB) {
+// Handle the non-swap case - just put srcB in place first.
+m_jit.move(srcB, destB);
+m_jit.move(srcA, destA);
+} else
+m_jit.swap(destA, destB);
 }
 
 // These methods add calls to C++ helper functions.


Modified: trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator32_64.cpp (96450 => 96451)

--- trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator32_64.cpp	2011-10-01 02:12:06 UTC (rev 96450)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCodeGenerator32_64.cpp	2011-10-01 02:14:36 UTC (rev 96451)
@@ -253,7 +253,6 @@
 GPRReg gpr = info.gpr();
 // If the register has already been locked we need to take a copy.
 // If not, we'll zero extend in place, so mark on the info that this is now type DataFormatInteger, not DataFormatJSInteger.
-tagGPR = allocate();
 if (m_gprs.isLocked(gpr)) {
 payloadGPR = allocate();
 m_jit.move(gpr, payloadGPR);
@@ -261,6 +260,7 @@
 payloadGPR = gpr;
 m_gprs.lock(gpr);
 }
+tagGPR = allocate();
 m_jit.move(info.registerFormat() == DataFormatInteger ? JITCompiler::TrustedImm32(JSValue::Int32Tag) : JITCompiler::TrustedImm32(JSValue::CellTag), tagGPR);
 m_gprs.release(gpr);
 m_gprs.retain(tagGPR, virtualRegister, SpillOrderJS);
@@ -386,9 +386,11 @@
 
 silentSpillAllRegisters(gpr);
 
-m_jit.moveDouble(fpr, FPRInfo::argumentFPR0);
+m_jit.subPtr(TrustedImm32(sizeof(double)),

[webkit-changes] [96453] trunk/Source/JavaScriptCore

2011-09-30 Thread dbates

Title: [96453] trunk/Source/_javascript_Core








Revision 96453
Author dba...@webkit.org
Date 2011-09-30 20:12:37 -0700 (Fri, 30 Sep 2011)


Log Message
2011-09-30  Daniel Bates  dba...@webkit.org

Attempt to fix the Apple Windows and WinCairo Debug builds after
http://trac.webkit.org/changeset/96446 (https://bugs.webkit.org/show_bug.cgi?id=69203).

* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: Remove the symbol
?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z since the
corresponding function, JSValue::toStrictThisObject(), was removed.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96452 => 96453)

--- trunk/Source/_javascript_Core/ChangeLog	2011-10-01 03:07:46 UTC (rev 96452)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-01 03:12:37 UTC (rev 96453)
@@ -1,3 +1,12 @@
+2011-09-30  Daniel Bates  dba...@webkit.org
+
+Attempt to fix the Apple Windows and WinCairo Debug builds after
+http://trac.webkit.org/changeset/96446 (https://bugs.webkit.org/show_bug.cgi?id=69203).
+
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def: Remove the symbol
+?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z since the
+corresponding function, JSValue::toStrictThisObject(), was removed.
+
 2011-09-30  Yuqiang Xian  yuqiang.x...@intel.com
 
 DFG operation results are not set correctly in JSVALUE32_64 DFG JIT


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (96452 => 96453)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2011-10-01 03:07:46 UTC (rev 96452)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2011-10-01 03:12:37 UTC (rev 96453)
@@ -347,7 +347,6 @@
 ?toNumberSlowCase@JSValue@JSC@@ABENPAVExecState@2@@Z
 ?toObject@JSCell@JSC@@QBEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
 ?toObjectSlowCase@JSValue@JSC@@ABEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
-?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z
 ?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
 ?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
 ?toString@JSString@JSC@@EBE?AVUString@2@PAVExecState@2@@Z






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

47 matches

Mail list logo