Changeset 230344 in webkit


Ignore:
Timestamp:
Apr 6, 2018 12:08:25 PM (6 years ago)
Author:
Alan Bujtas
Message:

Rebaseline LayoutReloaded patch file.

  • LayoutReloaded/misc/LayoutReloadedWebKit.patch:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r230325 r230344  
     12018-04-06  Zalan Bujtas  <zalan@apple.com>
     2
     3        Rebaseline LayoutReloaded patch file.
     4
     5        * LayoutReloaded/misc/LayoutReloadedWebKit.patch:
     6
    172018-04-05  Youenn Fablet  <youenn@apple.com>
    28
  • trunk/Tools/LayoutReloaded/misc/LayoutReloadedWebKit.patch

    r230037 r230344  
    2525     $(WebCore)/dom/UIEvent.idl \
    2626diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
    27 index 02da4cb443c..aa757fcb42e 100644
     27index ff942b36a44..5bc30f914af 100644
    2828--- a/Source/WebCore/Sources.txt
    2929+++ b/Source/WebCore/Sources.txt
    30 @@ -1798,7 +1798,9 @@ rendering/InlineBox.cpp
     30@@ -1797,7 +1797,9 @@ rendering/InlineBox.cpp
    3131 rendering/InlineElementBox.cpp
    3232 rendering/InlineFlowBox.cpp
     
    3939 rendering/LayoutState.cpp
    4040diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
    41 index f899f092389..2cd59716f8f 100644
     41index 690b9e941bd..3ffc4406907 100644
    4242--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
    4343+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
    44 @@ -397,6 +397,10 @@
     44@@ -396,6 +396,10 @@
    4545                1193408A1FEB355D00935F1E /* RenderTreeBuilderRuby.h in Headers */ = {isa = PBXBuildFile; fileRef = 119340881FEB355D00935F1E /* RenderTreeBuilderRuby.h */; };
    4646                119340971FED715500935F1E /* RenderTreeBuilderFormControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 119340951FED715500935F1E /* RenderTreeBuilderFormControls.h */; };
     
    5353                11E067EE1E6246E500162D16 /* SimpleLineLayoutCoverage.h in Headers */ = {isa = PBXBuildFile; fileRef = 11E067ED1E6246E500162D16 /* SimpleLineLayoutCoverage.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5454                1400D7A817136EA70077CE05 /* ScriptWrappableInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 1400D7A717136EA70077CE05 /* ScriptWrappableInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
    55 @@ -5704,6 +5708,13 @@
     55@@ -5699,6 +5703,13 @@
    5656                119340951FED715500935F1E /* RenderTreeBuilderFormControls.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderFormControls.h; sourceTree = "<group>"; };
    5757                119340A01FEE024000935F1E /* RenderTreeBuilderBlock.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeBuilderBlock.cpp; sourceTree = "<group>"; };
     
    6767                11C5F1182003E7760001AE60 /* RenderTreeBuilderInline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderInline.h; sourceTree = "<group>"; };
    6868                11C5F11D2003F69E0001AE60 /* RenderTreeBuilderBlockFlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderBlockFlow.h; sourceTree = "<group>"; };
    69 @@ -22130,6 +22141,7 @@
     69@@ -22115,6 +22126,7 @@
    7070                A83B79100CCB001B000B0825 /* Core */ = {
    7171                        isa = PBXGroup;
     
    7575                                7C30D9801F815AC100268356 /* JSAbortController.h */,
    7676                                7C30D9821F815AC200268356 /* JSAbortSignal.cpp */,
    77 @@ -25461,6 +25473,10 @@
     77@@ -25447,6 +25459,10 @@
    7878                F523D2F302DE443B018635CA /* rendering */ = {
    7979                        isa = PBXGroup;
     
    8686                                439046C212DA25CE00AF80A2 /* mathml */,
    8787                                FD08A879175D3926002CD360 /* shapes */,
    88 @@ -25755,6 +25771,8 @@
     88@@ -25742,6 +25758,8 @@
    8989                F523D32402DE4478018635CA /* dom */ = {
    9090                        isa = PBXGroup;
     
    9595                                2D5036661BCDDDC400E20BB3 /* mac */,
    9696                                51ECC3E42005831F00483EAE /* messageports */,
    97 @@ -26749,6 +26767,7 @@
     97@@ -26736,6 +26754,7 @@
    9898                                31DCD29D1AB4FBDE0072E817 /* AnimationTrigger.h in Headers */,
    9999                                0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
     
    103103                                A12C59EE2035FC9B0012236B /* ApplePayError.h in Headers */,
    104104                                7C6579E31E00827000E3A27A /* ApplePayLineItem.h in Headers */,
    105 @@ -30345,6 +30364,7 @@
     105@@ -30329,6 +30348,7 @@
    106106                                4945BFD413CF809000CC3B38 /* TransformState.h in Headers */,
    107107                                E17B491616A9B094001C8839 /* TransitionEvent.h in Headers */,
     
    111111                                37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */,
    112112                                14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */,
    113 @@ -30559,6 +30579,7 @@
     113@@ -30543,6 +30563,7 @@
    114114                                97AABD1E14FA09D5007457AE /* WebSocketChannel.h in Headers */,
    115115                                97AABD1F14FA09D5007457AE /* WebSocketChannelClient.h in Headers */,
     
    119119                                97AABD2314FA09D5007457AE /* WebSocketExtensionDispatcher.h in Headers */,
    120120                                4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */,
    121 @@ -31043,6 +31064,7 @@
     121@@ -31027,6 +31048,7 @@
    122122                                0719427F1D088F21002AA51D /* AVFoundationMIMETypeCache.mm in Sources */,
    123123                                070363E5181A1CDC00C074A5 /* AVMediaCaptureSource.mm in Sources */,
     
    361361+};
    362362diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
    363 index 5fc4cb16620..def018fdf3f 100644
     363index 4b1e8725795..cae6e476cad 100644
    364364--- a/Source/WebCore/dom/Node.cpp
    365365+++ b/Source/WebCore/dom/Node.cpp
     
    393393     RefPtr<ContainerNode> parent = parentNode();
    394394diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
    395 index 7488f5d47d2..cb0b054997f 100644
     395index 7f176126c7a..1b7a19e07f0 100644
    396396--- a/Source/WebCore/dom/Node.h
    397397+++ b/Source/WebCore/dom/Node.h
     
    425425     boolean isDefaultNamespace(DOMString? namespaceURI);
    426426diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
    427 index 2d423cf4fd3..2c292aefdc2 100644
     427index 90c3e8e5a78..41e4447ff23 100644
    428428--- a/Source/WebCore/page/DOMWindow.cpp
    429429+++ b/Source/WebCore/page/DOMWindow.cpp
     
    436436 #include "CSSRule.h"
    437437 #include "CSSRuleList.h"
    438 @@ -63,9 +64,11 @@
     438@@ -64,9 +65,11 @@
    439439 #include "FrameTree.h"
    440440 #include "FrameView.h"
     
    446446+#include "InlineTextBreaker.h"
    447447 #include "Location.h"
    448  #include "MainFrame.h"
    449448 #include "MediaQueryList.h"
     449 #include "MediaQueryMatcher.h"
    450450@@ -78,6 +81,7 @@
    451451 #include "PageConsoleClient.h"
     
    515515     return !m_frame;
    516516diff --git a/Source/WebCore/page/DOMWindow.h b/Source/WebCore/page/DOMWindow.h
    517 index 6422a48517a..381504c4a2a 100644
     517index 4c66b724e29..4ee2993438c 100644
    518518--- a/Source/WebCore/page/DOMWindow.h
    519519+++ b/Source/WebCore/page/DOMWindow.h
     
    543543+    Vector<Ref<InlineTextRun>> collectTextRuns(const String&, const Node&, float availableSpace);
    544544+
    545      // Self-referential attributes
    546  
    547545     DOMWindow* self() const;
     546 
     547     DOMWindow* opener() const;
    548548diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
    549 index 801a0fb3bb3..5f0eae7b1fe 100644
     549index 46ebc1561fa..cbcd213b46a 100644
    550550--- a/Source/WebCore/page/DOMWindow.idl
    551551+++ b/Source/WebCore/page/DOMWindow.idl
     
    563563     void alert(DOMString message);
    564564diff --git a/Source/WebCore/page/mac/PageMac.mm b/Source/WebCore/page/mac/PageMac.mm
    565 index 4807e7b61d1..f5916c11502 100644
     565index aa030c54617..7457861e142 100644
    566566--- a/Source/WebCore/page/mac/PageMac.mm
    567567+++ b/Source/WebCore/page/mac/PageMac.mm
     
    14351435 #include "RenderFragmentedFlow.h"
    14361436diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
    1437 index 0555b1e712f..8c784751a62 100644
     1437index 7f3d46b7dd8..8120bd369ac 100644
    14381438--- a/Source/WebCore/rendering/RenderObject.cpp
    14391439+++ b/Source/WebCore/rendering/RenderObject.cpp
Note: See TracChangeset for help on using the changeset viewer.