Diff
Modified: trunk/Source/WebCore/ChangeLog (199721 => 199722)
--- trunk/Source/WebCore/ChangeLog 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/ChangeLog 2016-04-19 13:03:32 UTC (rev 199722)
@@ -1,3 +1,21 @@
+2016-04-19 Antti Koivisto <an...@apple.com>
+
+ Move FontSelectorClient to a file of its own
+ https://bugs.webkit.org/show_bug.cgi?id=156738
+
+ Reviewed by Carlos Garcia Campos.
+
+ So modifying FontSelector does not trigger world rebuild via Document.h.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSFontSelector.cpp:
+ * dom/Document.h:
+ * html/canvas/CanvasRenderingContext2D.h:
+ * platform/graphics/FontSelector.h:
+ (WebCore::FontSelectorClient::~FontSelectorClient): Deleted.
+ * platform/graphics/FontSelectorClient.h: Added.
+ (WebCore::FontSelectorClient::~FontSelectorClient):
+
2016-04-19 Joanmarie Diggs <jdi...@igalia.com>
[GTK] accessibility/gtk/entry-and-password.html is failing since r194847
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (199721 => 199722)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-04-19 13:03:32 UTC (rev 199722)
@@ -6567,6 +6567,7 @@
E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */ = {isa = PBXBuildFile; fileRef = E401E0A31C3C0B8300F34D10 /* StyleChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
E401E0A61C3C0CF700F34D10 /* StyleChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */; };
+ E419041F1CC6486B00C35F5D /* FontSelectorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E419041E1CC6486B00C35F5D /* FontSelectorClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; };
E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; };
E425A49A18292B840020CFCF /* CollectionIndexCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E425A49918292B840020CFCF /* CollectionIndexCache.h */; };
@@ -14616,6 +14617,7 @@
E401E0A31C3C0B8300F34D10 /* StyleChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleChange.h; sourceTree = "<group>"; };
E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleChange.cpp; sourceTree = "<group>"; };
E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
+ E419041E1CC6486B00C35F5D /* FontSelectorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSelectorClient.h; sourceTree = "<group>"; };
E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; };
E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSValueKeywords.cpp; sourceTree = "<group>"; };
E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyTileGridTile.h; sourceTree = "<group>"; };
@@ -21942,6 +21944,7 @@
371F4FFB0D25E7F300ECE0D5 /* FontRanges.cpp */,
371F4FFA0D25E7F300ECE0D5 /* FontRanges.h */,
B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */,
+ E419041E1CC6486B00C35F5D /* FontSelectorClient.h */,
7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */,
7CE6CBFA187F370700D46BF5 /* FormatConverter.h */,
4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */,
@@ -26164,6 +26167,7 @@
97DCE20210807C750057D394 /* HistoryController.h in Headers */,
51741D110B07259A00ED442C /* HistoryItem.h in Headers */,
4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */,
+ E419041F1CC6486B00C35F5D /* FontSelectorClient.h in Headers */,
2D8287F716E4A0380086BD00 /* HitTestLocation.h in Headers */,
930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */,
9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (199721 => 199722)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-04-19 13:03:32 UTC (rev 199722)
@@ -46,6 +46,7 @@
#include "Font.h"
#include "FontCache.h"
#include "FontFaceSet.h"
+#include "FontSelectorClient.h"
#include "FontVariantBuilder.h"
#include "Frame.h"
#include "FrameLoader.h"
Modified: trunk/Source/WebCore/dom/Document.h (199721 => 199722)
--- trunk/Source/WebCore/dom/Document.h 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/dom/Document.h 2016-04-19 13:03:32 UTC (rev 199722)
@@ -34,7 +34,7 @@
#include "DocumentEventQueue.h"
#include "DocumentTiming.h"
#include "FocusDirection.h"
-#include "FontSelector.h"
+#include "FontSelectorClient.h"
#include "MediaProducer.h"
#include "MutationObserver.h"
#include "PageVisibilityState.h"
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (199721 => 199722)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-19 13:03:32 UTC (rev 199722)
@@ -33,6 +33,7 @@
#include "Color.h"
#include "FloatSize.h"
#include "FontCascade.h"
+#include "FontSelectorClient.h"
#include "GraphicsContext.h"
#include "GraphicsTypes.h"
#include "ImageBuffer.h"
Modified: trunk/Source/WebCore/platform/graphics/FontSelector.h (199721 => 199722)
--- trunk/Source/WebCore/platform/graphics/FontSelector.h 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/platform/graphics/FontSelector.h 2016-04-19 13:03:32 UTC (rev 199722)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef FontSelector_h
-#define FontSelector_h
+#pragma once
#include "FontRanges.h"
#include <wtf/Forward.h>
@@ -55,13 +54,4 @@
virtual unsigned version() const = 0;
};
-class FontSelectorClient {
-public:
- virtual ~FontSelectorClient() { }
-
- virtual void fontsNeedUpdate(FontSelector&) = 0;
-};
-
-} // namespace WebCore
-
-#endif // FontSelector_h
+}
Copied: trunk/Source/WebCore/platform/graphics/FontSelectorClient.h (from rev 199721, trunk/Source/WebCore/platform/graphics/FontSelector.h) (0 => 199722)
--- trunk/Source/WebCore/platform/graphics/FontSelectorClient.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/FontSelectorClient.h 2016-04-19 13:03:32 UTC (rev 199722)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2007, 2008, 2016 Apple 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. ``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
+ * 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.
+ */
+
+#pragma once
+
+namespace WebCore {
+
+class FontSelector;
+
+class FontSelectorClient {
+public:
+ virtual ~FontSelectorClient() { }
+
+ virtual void fontsNeedUpdate(FontSelector&) = 0;
+};
+
+}
Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (199721 => 199722)
--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-04-19 12:34:33 UTC (rev 199721)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-04-19 13:03:32 UTC (rev 199722)
@@ -28,6 +28,7 @@
#include "CSSStyleDeclaration.h"
#include "ElementChildIterator.h"
+#include "Glyph.h"
#include "SVGFontElement.h"
#include "SVGFontFaceElement.h"
#include "SVGGlyphElement.h"
