[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Mon Feb 21 00:06:37 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 5549467e2f73cf601b21b9a2bf2cdb77493438aa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 03:42:56 2011 +0000
2011-01-27 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r76891.
http://trac.webkit.org/changeset/76891
https://bugs.webkit.org/show_bug.cgi?id=53280
Makes every layout test crash (Requested by othermaciej on
#webkit).
* page/EventHandler.cpp:
* page/EventHandler.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::styleDidChange):
2011-01-27 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r76891.
http://trac.webkit.org/changeset/76891
https://bugs.webkit.org/show_bug.cgi?id=53280
Makes every layout test crash (Requested by othermaciej on
#webkit).
* Misc/WebIconDatabase.mm:
(-[ThreadEnabler threadEnablingSelector:]):
(importToWebCoreFormat):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76912 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ff9b10a..d15b1a8 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-27 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r76891.
+ http://trac.webkit.org/changeset/76891
+ https://bugs.webkit.org/show_bug.cgi?id=53280
+
+ Makes every layout test crash (Requested by othermaciej on
+ #webkit).
+
+ * page/EventHandler.cpp:
+ * page/EventHandler.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::styleDidChange):
+
2011-01-27 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed, rolling out r76839.
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 272984c..b2988cb 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
* Copyright (C) 2006 Alexey Proskuryakov (ap at webkit.org)
*
* Redistribution and use in source and binary forms, with or without
@@ -2152,15 +2152,6 @@ void EventHandler::scheduleHoverStateUpdate()
m_hoverTimer.startOneShot(0);
}
-void EventHandler::dispatchFakeMouseMoveEventSoon()
-{
- if (m_mousePressed)
- return;
-
- if (!m_fakeMouseMoveEventTimer.isActive())
- m_fakeMouseMoveEventTimer.startOneShot(fakeMouseMoveInterval);
-}
-
void EventHandler::dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad& quad)
{
FrameView* view = m_frame->view();
diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h
index 3e15291..6a7aac9 100644
--- a/Source/WebCore/page/EventHandler.h
+++ b/Source/WebCore/page/EventHandler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -108,7 +108,6 @@ public:
RenderObject* autoscrollRenderer() const;
void updateAutoscrollRenderer();
- void dispatchFakeMouseMoveEventSoon();
void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false,
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index 038e8a9..4c4ccce 100644
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -3,7 +3,7 @@
* (C) 1999 Antti Koivisto (koivisto at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
* (C) 2004 Allan Sandfeld Jensen (kde at carewolf.com)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2009 Google Inc. All rights reserved.
* Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
*
@@ -31,7 +31,6 @@
#include "CSSStyleSelector.h"
#include "Chrome.h"
#include "ContentData.h"
-#include "CursorList.h"
#include "DashArray.h"
#include "EditingBoundary.h"
#include "FloatQuad.h"
@@ -1860,17 +1859,6 @@ void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS
}
}
-static bool areNonIdenticalCursorListsEqual(const RenderStyle* a, const RenderStyle* b)
-{
- ASSERT(a->cursors() != b->cursors());
- return a->cursors() && b->cursors() && *a->cursors() == *b->cursors();
-}
-
-static inline bool areCursorsEqual(const RenderStyle* a, const RenderStyle* b)
-{
- return a->cursor() == b->cursor() && (a->cursors() == b->cursors() || areNonIdenticalCursorListsEqual(a, b));
-}
-
void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
if (s_affectsParentBlock)
@@ -1896,11 +1884,6 @@ void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldSt
// Don't check for repaint here; we need to wait until the layer has been
// updated by subclasses before we know if we have to repaint (in setStyle()).
-
- if (!areCursorsEqual(oldStyle, style())) {
- if (Frame* frame = this->frame())
- frame->eventHandler()->dispatchFakeMouseMoveEventSoon();
- }
}
void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer* newLayers)
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index e63de11..0e5329b 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-27 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r76891.
+ http://trac.webkit.org/changeset/76891
+ https://bugs.webkit.org/show_bug.cgi?id=53280
+
+ Makes every layout test crash (Requested by othermaciej on
+ #webkit).
+
+ * Misc/WebIconDatabase.mm:
+ (-[ThreadEnabler threadEnablingSelector:]):
+ (importToWebCoreFormat):
+
2011-01-27 Nate Chapin <japhet at chromium.org>
Reviewed by Adam Barth.
diff --git a/Source/WebKit/mac/Misc/WebIconDatabase.mm b/Source/WebKit/mac/Misc/WebIconDatabase.mm
index 67ab904..14ef037 100644
--- a/Source/WebKit/mac/Misc/WebIconDatabase.mm
+++ b/Source/WebKit/mac/Misc/WebIconDatabase.mm
@@ -559,8 +559,10 @@ static NSData* iconDataFromPathForIconURL(NSString *databasePath, NSString *icon
@implementation WebIconDatabasePrivate
@end
- at interface ThreadEnabler : NSObject
+ at interface ThreadEnabler : NSObject {
+}
+ (void)enableThreading;
+
- (void)threadEnablingSelector:(id)arg;
@end
@@ -568,6 +570,7 @@ static NSData* iconDataFromPathForIconURL(NSString *databasePath, NSString *icon
- (void)threadEnablingSelector:(id)arg
{
+ return;
}
+ (void)enableThreading
@@ -586,7 +589,7 @@ bool importToWebCoreFormat()
if (![NSThread isMultiThreaded])
[ThreadEnabler enableThreading];
ASSERT([NSThread isMultiThreaded]);
-
+
// Get the directory the old icon database *should* be in
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *databaseDirectory = [defaults objectForKey:WebIconDatabaseImportDirectoryDefaultsKey];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list