[webkit-changes] [219543] trunk

[mmaxfield]

Title: [219543] trunk








Revision 219543
Author mmaxfi...@apple.com
Date 2017-07-15 22:52:30 -0700 (Sat, 15 Jul 2017)


Log Message
line-height:  gets visually applied twice when text autosizing is in effect
https://bugs.webkit.org/show_bug.cgi?id=174536


Reviewed by Simon Fraser.

Source/WebCore:

StyleBuilderConverter::convertLineHeight() converts line-height:  into a
"percentage" length. Then, when layout needs to know what the computed value of
line-height is, RenderStyle::computedLineHeight() multiplies this percentage by
the computed font size.

With autosizing, the computed font size already incorporates the autosizing
multiplier, so we shouldn't also incorporate this multiplier into the percentage
value itself. getComputedStyle()'s lineHeightFromStyle() was compensating for
this double application by multiplying the percentage by the font-size's specified
value instead of its computed value, which is incorrect.

Test: fast/text-autosizing/line-height-number.html

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::lineHeightFromStyle):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertLineHeight):

LayoutTests:

* fast/text-autosizing/line-height-number-expected.html: Added.
* fast/text-autosizing/line-height-number.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
trunk/Source/WebCore/css/StyleBuilderConverter.h


Added Paths

trunk/LayoutTests/fast/text-autosizing/line-height-number-expected.html
trunk/LayoutTests/fast/text-autosizing/line-height-number.html




Diff

Modified: trunk/LayoutTests/ChangeLog (219542 => 219543)

--- trunk/LayoutTests/ChangeLog	2017-07-16 04:47:03 UTC (rev 219542)
+++ trunk/LayoutTests/ChangeLog	2017-07-16 05:52:30 UTC (rev 219543)
@@ -1,3 +1,14 @@
+2017-07-15  Myles C. Maxfield  
+
+line-height:  gets visually applied twice when text autosizing is in effect
+https://bugs.webkit.org/show_bug.cgi?id=174536
+
+
+Reviewed by Simon Fraser.
+
+* fast/text-autosizing/line-height-number-expected.html: Added.
+* fast/text-autosizing/line-height-number.html: Added.
+
 2017-07-14  Zan Dobersek  
 
 [GCrypt] Implement CryptoKeyRSA PKCS#8 exports


Added: trunk/LayoutTests/fast/text-autosizing/line-height-number-expected.html (0 => 219543)

--- trunk/LayoutTests/fast/text-autosizing/line-height-number-expected.html	(rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/line-height-number-expected.html	2017-07-16 05:52:30 UTC (rev 219543)
@@ -0,0 +1,9 @@
+
+
+
+
+
+This test makes sure that text-size-adjust only gets applied once to line-height.
+asdf asdf
+
+


Added: trunk/LayoutTests/fast/text-autosizing/line-height-number.html (0 => 219543)

--- trunk/LayoutTests/fast/text-autosizing/line-height-number.html	(rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/line-height-number.html	2017-07-16 05:52:30 UTC (rev 219543)
@@ -0,0 +1,15 @@
+
+
+
+
+if (window.internals) {
+internals.settings.setTextAutosizingEnabled(true);
+internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+
+
+
+This test makes sure that text-size-adjust only gets applied once to line-height.
+asdf asdf
+
+


Modified: trunk/Source/WebCore/ChangeLog (219542 => 219543)

--- trunk/Source/WebCore/ChangeLog	2017-07-16 04:47:03 UTC (rev 219542)
+++ trunk/Source/WebCore/ChangeLog	2017-07-16 05:52:30 UTC (rev 219543)
@@ -1,3 +1,29 @@
+2017-07-15  Myles C. Maxfield  
+
+line-height:  gets visually applied twice when text autosizing is in effect
+https://bugs.webkit.org/show_bug.cgi?id=174536
+
+
+Reviewed by Simon Fraser.
+
+StyleBuilderConverter::convertLineHeight() converts line-height:  into a
+"percentage" length. Then, when layout needs to know what the computed value of
+line-height is, RenderStyle::computedLineHeight() multiplies this percentage by
+the computed font size.
+
+With autosizing, the computed font size already incorporates the autosizing
+multiplier, so we shouldn't also incorporate this multiplier into the percentage
+value itself. getComputedStyle()'s lineHeightFromStyle() was compensating for
+this double application by multiplying the percentage by the font-size's specified
+value instead of its computed value, which is incorrect.
+
+Test: fast/text-autosizing/line-height-number.html
+
+* css/CSSComputedStyleDeclaration.cpp:
+(WebCore::lineHeightFromStyle):
+* css/StyleBuilderConverter.h:
+(WebCore::StyleBuilderConverter::convertLineHeight):
+
 2017-07-15  Wenson Hsieh  
 
 [iOS WK2] Presenting an action sheet on an image map prevents selection UI from updating


Modified: 

[webkit-changes] [219542] trunk/Tools

[ddkilzer]

Title: [219542] trunk/Tools








Revision 219542
Author ddkil...@apple.com
Date 2017-07-15 21:47:03 -0700 (Sat, 15 Jul 2017)


Log Message
Make it possible to extend check-webkit-style with Apple-internal checkers



Reviewed by Darin Adler.

* Scripts/webkitpy/style/checker.py: Import apple_additions.
(_all_categories): Add categories from apple_additions() if it
exists.
(CheckerDispatcher._create_checker): Create python checker
from apple_additions() if it exists.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/style/checker.py




Diff

Modified: trunk/Tools/ChangeLog (219541 => 219542)

--- trunk/Tools/ChangeLog	2017-07-16 04:01:30 UTC (rev 219541)
+++ trunk/Tools/ChangeLog	2017-07-16 04:47:03 UTC (rev 219542)
@@ -1,3 +1,17 @@
+2017-07-15  David Kilzer  
+
+Make it possible to extend check-webkit-style with Apple-internal checkers
+
+
+
+Reviewed by Darin Adler.
+
+* Scripts/webkitpy/style/checker.py: Import apple_additions.
+(_all_categories): Add categories from apple_additions() if it
+exists.
+(CheckerDispatcher._create_checker): Create python checker
+from apple_additions() if it exists.
+
 2017-07-15  Wenson Hsieh  
 
 [iOS WK2] Presenting an action sheet on an image map prevents selection UI from updating


Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (219541 => 219542)

--- trunk/Tools/Scripts/webkitpy/style/checker.py	2017-07-16 04:01:30 UTC (rev 219541)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py	2017-07-16 04:47:03 UTC (rev 219542)
@@ -61,6 +61,7 @@
 from optparser import ArgumentParser
 from optparser import DefaultCommandOptionValues
 from webkitpy.common.system.logutils import configure_logging as _configure_logging
+from webkitpy.port.config import apple_additions
 
 
 _log = logging.getLogger(__name__)
@@ -374,6 +375,9 @@
 #settings against the known categories, etc).
 categories = categories.union(["pep8/W191", "pep8/W291", "pep8/E501"])
 
+if apple_additions():
+categories = categories.union(apple_additions().all_categories())
+
 return categories
 
 
@@ -643,7 +647,10 @@
 else:
 checker = JSONChecker(file_path, handle_style_error)
 elif file_type == FileType.PYTHON:
-checker = PythonChecker(file_path, handle_style_error)
+if apple_additions():
+checker = apple_additions().python_checker(file_path, handle_style_error)
+else:
+checker = PythonChecker(file_path, handle_style_error)
 elif file_type == FileType.XML:
 checker = XMLChecker(file_path, handle_style_error)
 elif file_type == FileType.XCODEPROJ:






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

[webkit-changes] [219541] trunk

[wenson_hsieh]

Title: [219541] trunk








Revision 219541
Author wenson_hs...@apple.com
Date 2017-07-15 21:01:30 -0700 (Sat, 15 Jul 2017)


Log Message
[iOS WK2] Presenting an action sheet on an image map prevents selection UI from updating
https://bugs.webkit.org/show_bug.cgi?id=174539


Reviewed by Darin Adler.

Source/WebCore:

Currently, if TextIndicator fails to take a snapshot in TextIndicator::createWithRange, we will enter an
inconsistent state in the web process where Editor will continue to ignore selection changes until the next time
Editor::setIgnoreSelectionChanges(false) is called. This causes us to indefinitely defer EditorState updates to
the UI process, which leads to selection UI appearing unresponsive.

To fix this, we introduce a new TemporarySelectionChange object to simplify selection changes and/or
EditorState-update-ignoring behaviors within the scope of a single function. The constructor applies these
temporary changes, and the destructor reverts them as needed to their prior values.

This patch only adopts TemporarySelectionChange in order to fix this bug, but future patches will replace the
remaining places where we temporarily change selection and/or ignore selection with this helper.

Test: ActionSheetTests.ImageMapDoesNotDestroySelection.

* editing/Editor.cpp:
(WebCore::TemporarySelectionChange::TemporarySelectionChange):
(WebCore::TemporarySelectionChange::~TemporarySelectionChange):
* editing/Editor.h:
* editing/FrameSelection.h:
(WebCore::FrameSelection::isUpdateAppearanceEnabled):
* page/TextIndicator.cpp:
(WebCore::TextIndicator::createWithRange):

Source/WebKit:

Small tweak to avoid presenting at the element rect or text rect if the interaction information failed to
capture valid bounds for the element. We instead fall back to presenting at the touch location. This addresses
problems when presenting the action sheet popover on image maps on iPad, where GetPositionInformation fails to
capture correct data about for the .

* UIProcess/ios/WKActionSheetAssistant.mm:
(presentationStyleForView):

Tools:

Adds a new unit test suite to cover action sheet popover presentation.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2Cocoa/image-map.html: Added.
* TestWebKitAPI/Tests/ios/ActionSheetTests.mm: Added.
(-[ActionSheetObserver waitForActionSheetAfterBlock:]):

Runs the given block and waits until the UI process has indicated that it will present an action sheet.

(-[ActionSheetObserver _webView:actionsForElement:defaultActions:]):
(TestWebKitAPI::IPadUserInterfaceSwizzler::IPadUserInterfaceSwizzler):

Helper class to alter the behavior of [[UIDevice currentDevice] userInterfaceIdiom] for testing.

(TestWebKitAPI::IPadUserInterfaceSwizzler::padUserInterfaceIdiom):
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/Editor.cpp
trunk/Source/WebCore/editing/Editor.h
trunk/Source/WebCore/editing/FrameSelection.h
trunk/Source/WebCore/page/TextIndicator.cpp
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/image-map.html
trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (219540 => 219541)

--- trunk/Source/WebCore/ChangeLog	2017-07-16 03:45:04 UTC (rev 219540)
+++ trunk/Source/WebCore/ChangeLog	2017-07-16 04:01:30 UTC (rev 219541)
@@ -1,3 +1,34 @@
+2017-07-15  Wenson Hsieh  
+
+[iOS WK2] Presenting an action sheet on an image map prevents selection UI from updating
+https://bugs.webkit.org/show_bug.cgi?id=174539
+
+
+Reviewed by Darin Adler.
+
+Currently, if TextIndicator fails to take a snapshot in TextIndicator::createWithRange, we will enter an
+inconsistent state in the web process where Editor will continue to ignore selection changes until the next time
+Editor::setIgnoreSelectionChanges(false) is called. This causes us to indefinitely defer EditorState updates to
+the UI process, which leads to selection UI appearing unresponsive.
+
+To fix this, we introduce a new TemporarySelectionChange object to simplify selection changes and/or
+EditorState-update-ignoring behaviors within the scope of a single function. The constructor applies these
+temporary changes, and the destructor reverts them as needed to their prior values.
+
+This patch only adopts TemporarySelectionChange in order to fix this bug, but future patches will replace the
+remaining places where we temporarily change selection and/or ignore selection with this helper.
+
+Test: ActionSheetTests.ImageMapDoesNotDestroySelection.
+
+* editing/Editor.cpp:
+(WebCore::TemporarySelectionChange::TemporarySelectionChange):
+

[webkit-changes] [219540] trunk/Tools

[weinig]

Title: [219540] trunk/Tools








Revision 219540
Author wei...@apple.com
Date 2017-07-15 20:45:04 -0700 (Sat, 15 Jul 2017)


Log Message
[Scripts] Make svn-create-patch work better when called in sub directories
https://bugs.webkit.org/show_bug.cgi?id=174551

Reviewed by Darin Adler.

- Fixes manufacturePatchForAdditionWithHistory to use the correct path
  by ensuring that the prefix is applied as is done in generateDiff.
- Silence output of explanatory lines from svn stat (" > move to ...")
  that show up in STDERR when running svn-create-patch.
- Add verbose logging that I found useful while debugging this issue.

* Scripts/svn-create-patch:
(findBaseUrl):
(findMimeType):
(findSourceFileAndRevision):
(generateDiff):
(generateFileList):
(manufacturePatchForAdditionWithHistory):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/svn-create-patch




Diff

Modified: trunk/Tools/ChangeLog (219539 => 219540)

--- trunk/Tools/ChangeLog	2017-07-15 22:03:23 UTC (rev 219539)
+++ trunk/Tools/ChangeLog	2017-07-16 03:45:04 UTC (rev 219540)
@@ -1,3 +1,24 @@
+2017-07-15  Sam Weinig  
+
+[Scripts] Make svn-create-patch work better when called in sub directories
+https://bugs.webkit.org/show_bug.cgi?id=174551
+
+Reviewed by Darin Adler.
+
+- Fixes manufacturePatchForAdditionWithHistory to use the correct path
+  by ensuring that the prefix is applied as is done in generateDiff.
+- Silence output of explanatory lines from svn stat (" > move to ...")
+  that show up in STDERR when running svn-create-patch.
+- Add verbose logging that I found useful while debugging this issue.
+
+* Scripts/svn-create-patch:
+(findBaseUrl):
+(findMimeType):
+(findSourceFileAndRevision):
+(generateDiff):
+(generateFileList):
+(manufacturePatchForAdditionWithHistory):
+
 2017-07-15  Jonathan Bedard  
 
 Unreviewed build fix after r219537.


Modified: trunk/Tools/Scripts/svn-create-patch (219539 => 219540)

--- trunk/Tools/Scripts/svn-create-patch	2017-07-15 22:03:23 UTC (rev 219539)
+++ trunk/Tools/Scripts/svn-create-patch	2017-07-16 03:45:04 UTC (rev 219540)
@@ -65,7 +65,7 @@
 sub generateFileList($\%);
 sub hunkHeaderLineRegExForFile($);
 sub isBinaryMimeType($);
-sub manufacturePatchForAdditionWithHistory($);
+sub manufacturePatchForAdditionWithHistory($$);
 sub numericcmp($$);
 sub outputBinaryContent($);
 sub patchpathcmp($$);
@@ -79,6 +79,7 @@
 my $showHelp;
 my $checkWebKitStyle = 0;
 my $ignoreChangelogs = 0;
+my $verbose = 0;
 my $devNull = File::Spec->devnull();
 
 my $result = GetOptions(
@@ -85,9 +86,10 @@
 "help"   => \$showHelp,
 "ignore-changelogs" => \$ignoreChangelogs,
 "style!" => \$checkWebKitStyle,
+"verbose" => \$verbose,
 );
 if (!$result || $showHelp) {
-print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
+print STDERR basename($0) . " [-h|--help] [-v|--verbose] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
 exit 1;
 }
 
@@ -100,6 +102,13 @@
 generateFileList($path, %diffFiles);
 }
 
+if ($verbose) {
+print STDERR "List of files for patch:\n";
+for my $file (sort patchpathcmp values %diffFiles) {
+print STDERR "  " . $file->{path} . "\n";
+}
+}
+
 my $svnRoot = determineSVNRoot();
 my $prefix = chdirReturningRelativePath($svnRoot);
 
@@ -157,6 +166,9 @@
 my ($infoPath) = @_;
 my $baseUrl;
 my $escapedInfoPath = escapeSubversionPath($infoPath);
+
+print STDERR "Performing \"svn info '$escapedInfoPath'\"\n" if $verbose;
+
 open INFO, "svn info '$escapedInfoPath' |" or die;
 while () {
 if (/^URL: (.+?)[\r\n]*$/) {
@@ -172,6 +184,9 @@
 my ($file, $revision) = @_;
 my $args = $revision ? "--revision $revision" : "";
 my $escapedFile = escapeSubversionPath($file);
+
+print STDERR "Performing \"svn propget svn:mime-type $args '$escapedFile' 2> $devNull\"\n" if $verbose;
+
 open PROPGET, "svn propget svn:mime-type $args '$escapedFile' 2> $devNull |" or die;
 my $mimeType = ;
 close PROPGET;
@@ -203,6 +218,9 @@
 my $sourceFile;
 my $sourceRevision;
 my $escapedFile = escapeSubversionPath($file);
+
+print STDERR "Performing \"svn info '$escapedFile'\"\n" if $verbose;
+
 open INFO, "svn info '$escapedFile' |" or die;
 while () {
 if (/^Copied From URL: (.+?)[\r\n]*$/) {
@@ -227,11 +245,14 @@
 my $patch = "";
 my $isAdditionWithHistory = $fileData->{modificationType} eq "additionWithHistory";
 if ($isAdditionWithHistory) {
-manufacturePatchForAdditionWithHistory($fileData);
+manufacturePatchForAdditionWithHistory($fileData, $prefix);
 }
 
 my $diffOptions = diffOptionsForFile($file);
 my $escapedFile = escapeSubversionPath($file);
+
+print STDERR "Performing \"svn diff --diff-cmd 

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

[mmaxfield]

Title: [219539] trunk/Source/WebCore








Revision 219539
Author mmaxfi...@apple.com
Date 2017-07-15 15:03:23 -0700 (Sat, 15 Jul 2017)


Log Message
Clean up line-height and minimumFontSize functions
https://bugs.webkit.org/show_bug.cgi?id=174535

Reviewed by Simon Fraser.

No behavior change.

No new tests because there is no behavior change.

* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertLineHeight):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::styleForKeyframe):
(WebCore::StyleResolver::adjustRenderStyle):
(WebCore::StyleResolver::pseudoStyleRulesForElement):
(WebCore::StyleResolver::applyMatchedProperties):
(WebCore::StyleResolver::cascadedPropertiesForRollback):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::checkForZoomChange):
(WebCore::StyleResolver::createFilterOperations):
(WebCore::StyleResolver::CascadedProperties::set):
(WebCore::StyleResolver::applyCascadedProperties):
* style/StyleFontSizeFunctions.cpp:
(WebCore::Style::computedFontSizeFromSpecifiedSize):
(WebCore::Style::computedFontSizeFromSpecifiedSizeForSVGInlineText):
(): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/StyleBuilderConverter.h
trunk/Source/WebCore/css/StyleResolver.cpp
trunk/Source/WebCore/style/StyleFontSizeFunctions.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (219538 => 219539)

--- trunk/Source/WebCore/ChangeLog	2017-07-15 21:47:16 UTC (rev 219538)
+++ trunk/Source/WebCore/ChangeLog	2017-07-15 22:03:23 UTC (rev 219539)
@@ -1,3 +1,32 @@
+2017-07-15  Myles C. Maxfield  
+
+Clean up line-height and minimumFontSize functions
+https://bugs.webkit.org/show_bug.cgi?id=174535
+
+Reviewed by Simon Fraser.
+
+No behavior change.
+
+No new tests because there is no behavior change.
+
+* css/StyleBuilderConverter.h:
+(WebCore::StyleBuilderConverter::convertLineHeight):
+* css/StyleResolver.cpp:
+(WebCore::StyleResolver::styleForKeyframe):
+(WebCore::StyleResolver::adjustRenderStyle):
+(WebCore::StyleResolver::pseudoStyleRulesForElement):
+(WebCore::StyleResolver::applyMatchedProperties):
+(WebCore::StyleResolver::cascadedPropertiesForRollback):
+(WebCore::StyleResolver::applyProperty):
+(WebCore::StyleResolver::checkForZoomChange):
+(WebCore::StyleResolver::createFilterOperations):
+(WebCore::StyleResolver::CascadedProperties::set):
+(WebCore::StyleResolver::applyCascadedProperties):
+* style/StyleFontSizeFunctions.cpp:
+(WebCore::Style::computedFontSizeFromSpecifiedSize):
+(WebCore::Style::computedFontSizeFromSpecifiedSizeForSVGInlineText):
+(): Deleted.
+
 2017-07-14  Jonathan Bedard  
 
 Add iOS 11 SPI


Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (219538 => 219539)

--- trunk/Source/WebCore/css/StyleBuilderConverter.h	2017-07-15 21:47:16 UTC (rev 219538)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h	2017-07-15 22:03:23 UTC (rev 219539)
@@ -1434,14 +1434,22 @@
 length = Length(length.value() * multiplier, Fixed);
 return length;
 }
+
+// Line-height percentages need to inherit as if they were Fixed pixel values. In the example:
+// 
+// the inner element should have line-height of 15px. However, in this example:
+// 
+// the inner element should have a line-height of 150px. Therefore, we map percentages to Fixed
+// values and raw numbers to percentages.
 if (primitiveValue.isPercentage()) {
 // FIXME: percentage should not be restricted to an integer here.
 return Length((styleResolver.style()->computedFontSize() * primitiveValue.intValue()) / 100, Fixed);
 }
-if (primitiveValue.isNumber()) {
-// FIXME: number and percentage values should produce the same type of Length (ie. Fixed or Percent).
+if (primitiveValue.isNumber())
 return Length(primitiveValue.doubleValue() * multiplier * 100.0, Percent);
-}
+
+// FIXME: The parser should only emit the above types, so this should never be reached. We should change the
+// type of this function to return just a Length (and not an Optional).
 return std::nullopt;
 }
 


Modified: trunk/Source/WebCore/css/StyleResolver.cpp (219538 => 219539)

--- trunk/Source/WebCore/css/StyleResolver.cpp	2017-07-15 21:47:16 UTC (rev 219538)
+++ trunk/Source/WebCore/css/StyleResolver.cpp	2017-07-15 22:03:23 UTC (rev 219539)
@@ -425,7 +425,7 @@
 // decl, there's nothing to override. So just add the first properties.
 CascadedProperties cascade(direction, writingMode);
 cascade.addNormalMatches(result, 0, result.matchedProperties().size() - 1);
-
+
 // Resolve custom properties first.
 applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom, );
 
@@ -1048,7 +1048,7 @@
 if 

[webkit-changes] [219538] trunk/Tools

[jbedard]

Title: [219538] trunk/Tools








Revision 219538
Author jbed...@apple.com
Date 2017-07-15 14:47:16 -0700 (Sat, 15 Jul 2017)


Log Message
Unreviewed build fix after r219537.

* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm




Diff

Modified: trunk/Tools/ChangeLog (219537 => 219538)

--- trunk/Tools/ChangeLog	2017-07-15 05:41:54 UTC (rev 219537)
+++ trunk/Tools/ChangeLog	2017-07-15 21:47:16 UTC (rev 219538)
@@ -1,3 +1,9 @@
+2017-07-15  Jonathan Bedard  
+
+Unreviewed build fix after r219537.
+
+* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+
 2017-07-14  Jonathan Bedard  
 
 Add iOS 11 SPI


Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (219537 => 219538)

--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm	2017-07-15 05:41:54 UTC (rev 219537)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm	2017-07-15 21:47:16 UTC (rev 219538)
@@ -42,9 +42,13 @@
 typedef void (^DataLoadCompletionBlock)(NSData *, NSError *);
 typedef void (^UIItemProviderDataLoadCompletionBlock)(NSData *, NSError *);
 
+#if !USE(APPLE_INTERNAL_SDK)
+
 @interface UIItemProviderRepresentationOptions : NSObject
 @end
 
+#endif
+
 @interface UIItemProvider()
 + (UIItemProvider *)itemProviderWithURL:(NSURL *)url title:(NSString *)title;
 - (void) registerDataRepresentationForTypeIdentifier:(NSString *)typeIdentifier options:(UIItemProviderRepresentationOptions*)options loadHandler:(NSProgress * (^)(void (^UIItemProviderDataLoadCompletionBlock)(NSData *item, NSError *error))) loadHandler;






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